diff options
author | Varun Wadekar <vwadekar@nvidia.com> | 2011-08-22 11:17:36 +0530 |
---|---|---|
committer | Varun Colbert <vcolbert@nvidia.com> | 2011-09-02 17:55:50 -0700 |
commit | 012987841295fc725ca5fb9fe92be573802f31c2 (patch) | |
tree | a2b830922ddafb9c101d09871b21d8edd35a956d /drivers/usb | |
parent | 438922d29d2a1d0a25bc4fe797390f29fc38d186 (diff) |
usb: gadget: enable rndis along with usb accessory
as of now usb accessory disables everything else
other than adb. enable rndis along with usb
accessory to enable tethering.
Bug 854919
Reviewed-on: http://git-master/r/#change,48411
(cherry-picked from I658d1d150977e38b707ba4024a9deff3b0439cdc)
Change-Id: Icf3a92378d0ecd6f579515d6d45f469b05780c6a
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/49771
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/gadget/android.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c index a107dd25fc8f..2c22ec26d122 100644 --- a/drivers/usb/gadget/android.c +++ b/drivers/usb/gadget/android.c @@ -439,7 +439,8 @@ void android_enable_function(struct usb_function *f, int enable) /* disable everything else (and keep adb for now) */ list_for_each_entry(func, &android_config_driver.functions, list) { if (strcmp(func->name, "accessory") - && strcmp(func->name, "adb")) { + && strcmp(func->name, "adb") + && strcmp(func->name, "rndis")) { usb_function_set_enabled(func, 0); } } |