From 1c4987b92ce6db6697992a44a149a23ef55fa3d1 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Mon, 23 Aug 2010 08:17:21 -0400 Subject: [PATCH] USB: gadget: android: Disable MTP when RNDIS function is enabled. Signed-off-by: Mike Lockwood --- drivers/usb/gadget/android.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c index e258f186c50b..8f8b6376681c 100644 --- a/drivers/usb/gadget/android.c +++ b/drivers/usb/gadget/android.c @@ -333,12 +333,12 @@ void android_enable_function(struct usb_function *f, int enable) dev->cdev->desc.bDeviceClass = USB_CLASS_PER_INTERFACE; /* Windows does not support other interfaces when RNDIS is enabled, - * so we disable UMS when RNDIS is on. + * so we disable UMS and MTP when RNDIS is on. */ list_for_each_entry(func, &android_config_driver.functions, list) { - if (!strcmp(func->name, "usb_mass_storage")) { + if (!strcmp(func->name, "usb_mass_storage") + || !strcmp(func->name, "mtp")) { usb_function_set_enabled(func, !enable); - break; } } } -- 2.11.0