diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2012-12-03 23:07:05 +0400 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2013-01-10 14:38:52 +0400 |
| commit | 8f900a9a6e2691441ad763952d640ac44220e5dc (patch) | |
| tree | 5f00b9cba299d1dfa035bf3dc13cb1029e39381a /drivers/usb/gadget/webcam.c | |
| parent | 98f3a1b90795d7216de0d56157868d174317f91a (diff) | |
| download | linux-8f900a9a6e2691441ad763952d640ac44220e5dc.tar.xz | |
usb: gadget: consider link speed for bMaxPower
The USB 2.0 specification says that bMaxPower is the maximum power
consumption expressed in 2 mA units and the USB 3.0 specification says
that it is expressed in 8 mA units.
This patch renames bMaxPower to MaxPower and the various /2 and *2 are
removed. Before reporting the config descriptor, the proper value is
computer based on the speed, all in-tree users are updated. MaxPower is
also increased to u16 so we can store the nokia gadget value which is
larger than the max value allowed for u8.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/webcam.c')
| -rw-r--r-- | drivers/usb/gadget/webcam.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/webcam.c b/drivers/usb/gadget/webcam.c index 69cf5c2cd335..8cef1e658c29 100644 --- a/drivers/usb/gadget/webcam.c +++ b/drivers/usb/gadget/webcam.c @@ -336,7 +336,7 @@ static struct usb_configuration webcam_config_driver = { .bConfigurationValue = 1, .iConfiguration = 0, /* dynamic */ .bmAttributes = USB_CONFIG_ATT_SELFPOWER, - .bMaxPower = CONFIG_USB_GADGET_VBUS_DRAW / 2, + .MaxPower = CONFIG_USB_GADGET_VBUS_DRAW, }; static int /* __init_or_exit */ |