diff options
| author | Scott Anderson <saa@google.com> | 2012-01-18 15:56:51 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@git.omapzoom.org> | 2012-10-18 07:49:29 -0500 |
| commit | a94cab5eb43d074c1809ce2829177387ad9f493a (patch) | |
| tree | ee8dedd31226b8aace4b57408f492cbca5e794a8 /drivers/usb/gadget | |
| parent | d70e45b64dad7b50c3bff5d59cd5968537920dc8 (diff) | |
| download | kernel_samsung_espresso10-a94cab5eb43d074c1809ce2829177387ad9f493a.zip kernel_samsung_espresso10-a94cab5eb43d074c1809ce2829177387ad9f493a.tar.gz kernel_samsung_espresso10-a94cab5eb43d074c1809ce2829177387ad9f493a.tar.bz2 | |
usb: gadget: android: Honor CONFIG_USB_GADGET_VBUS_DRAW
The maximum current draw was hard coded to 500 mA. composite.c
has code that uses CONFIG_USB_GADGET_VBUS_DRAW to set the
bMaxPower and to set whether or not the device is self-powered if
they haven't been set. This change removes the code in android.c
to allow composite.c to set them.
Change-Id: I9db37922e91ee86e9e5c0e14519e119e5c41ca48
Signed-off-by: Scott Anderson <saa@google.com>
Signed-off-by: Ruslan Bilovol <ruslan.bilovol@ti.com>
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/android.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c index 71ccd6b..1236d6f 100644 --- a/drivers/usb/gadget/android.c +++ b/drivers/usb/gadget/android.c @@ -160,8 +160,6 @@ static struct usb_configuration android_config_driver = { .label = "android", .unbind = android_unbind_config, .bConfigurationValue = 1, - .bmAttributes = USB_CONFIG_ATT_ONE, - .bMaxPower = 0xFA, /* 500ma */ }; static void android_work(struct work_struct *data) |