USB: gadget: android: Disable MTP when RNDIS function is enabled.

Signed-off-by: Mike Lockwood <lockwood@android.com>

diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c
index e258f186c50b76193f58fcc4a428a7c844ccb443..8f8b6376681c70f572054b2d8955cd3c3579da7c 100644 (file)
--- 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;
                                }
                        }
                }