diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-08-23 08:17:21 -0400 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 09:09:09 -0700 |
| commit | d6b1d7348ac1d5f1c51657cb750aa493974a08a9 (patch) | |
| tree | af1be9d7baa39be78b9c62c9a922b6b5b2282873 /drivers/usb | |
| parent | 1de4d4d8df6703c2af229c3a8a3c1ec4b14eabab (diff) | |
| download | kernel_samsung_aries-d6b1d7348ac1d5f1c51657cb750aa493974a08a9.zip kernel_samsung_aries-d6b1d7348ac1d5f1c51657cb750aa493974a08a9.tar.gz kernel_samsung_aries-d6b1d7348ac1d5f1c51657cb750aa493974a08a9.tar.bz2 | |
USB: gadget: android: Disable MTP when RNDIS function is enabled.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/android.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c index e258f18..8f8b637 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; } } } |