usb/gadget: set our device as BUS-POWERED instead of SELF-POWERED

BZ: 18296

Per compliance requirement, if USB device draws more than 100mA, it
should be set itself as a BUS-POWERED device.

Change-Id: I1a2033a9fad700a9cd0f945be3405ac502e4d143
Signed-off-by: Wu, Hao <hao.wu@intel.com>
Reviewed-on: http://android.intel.com:8080/29851
Reviewed-by: Zhuang, Jin Can <jin.can.zhuang@intel.com>
Reviewed-by: Tang, Richard <richard.tang@intel.com>
Reviewed-by: Meng, Zhe <zhe.meng@intel.com>
Tested-by: Meng, Zhe <zhe.meng@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c
index b1a31d9..1f751ba 100644 (file)
--- a/drivers/usb/gadget/android.c
+++ b/drivers/usb/gadget/android.c
@@ -154,7 +154,7 @@ static struct usb_configuration android_config_driver = {
        .label          = "android",
        .unbind         = android_unbind_config,
        .bConfigurationValue = 1,
-       .bmAttributes   = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER,
+       .bmAttributes   = USB_CONFIG_ATT_ONE,
        .bMaxPower      = 0xFA, /* 500ma */
 };
 

diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c
index 1a9bd9a..f8ed94c 100644 (file)
--- a/drivers/usb/gadget/langwell_udc.c
+++ b/drivers/usb/gadget/langwell_udc.c
@@ -2960,7 +2960,6 @@ static void handle_usb_reset(struct langwell_udc *dev)
 
        /* remote wakeup reset to 0 when the device is reset */
        dev->remote_wakeup = 0;
-       dev->dev_status = 1 << USB_DEVICE_SELF_POWERED;
        dev->gadget.b_hnp_enable = 0;
        dev->gadget.a_hnp_support = 0;
        dev->gadget.a_alt_hnp_support = 0;
@@ -3533,7 +3532,6 @@ static int langwell_udc_probe(struct pci_dev *pdev,
 
        /* remote wakeup reset to 0 when the device is reset */
        dev->remote_wakeup = 0;
-       dev->dev_status = 1 << USB_DEVICE_SELF_POWERED;
 
 #ifndef        OTG_TRANSCEIVER
        /* reset device controller */