diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2012-09-10 17:01:53 +0400 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-09-10 17:12:59 +0400 |
| commit | 7d16e8d3eb704f5f6eb5a271d5758b495634e8e6 (patch) | |
| tree | 146c2f02239fc5df53976092384bc74ed29f7c02 /drivers/usb/gadget/hid.c | |
| parent | 3b4a3fc0ba83265c0bfcfdfc3416e65e47441747 (diff) | |
| download | linux-7d16e8d3eb704f5f6eb5a271d5758b495634e8e6.tar.xz | |
usb: gadget: push VID/PID/USB BCD module option into gadgets
This patch moves the module options idVendor, idProduct and bcdDevice
from composite.c into each gadgets. This ensures compatibility with
current gadgets and removes the global variable which brings me step
closer towards composite.c in libcomposite
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/hid.c')
| -rw-r--r-- | drivers/usb/gadget/hid.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/hid.c b/drivers/usb/gadget/hid.c index 1e3f03be94df..59fe7eef00da 100644 --- a/drivers/usb/gadget/hid.c +++ b/drivers/usb/gadget/hid.c @@ -48,6 +48,7 @@ struct hidg_func_node { static LIST_HEAD(hidg_func_list); /*-------------------------------------------------------------------------*/ +USB_GADGET_COMPOSITE_OPTIONS(); static struct usb_device_descriptor device_desc = { .bLength = sizeof device_desc, @@ -188,6 +189,7 @@ static int __init hid_bind(struct usb_composite_dev *cdev) if (status < 0) return status; + usb_composite_overwrite_options(cdev, &coverwrite); dev_info(&gadget->dev, DRIVER_DESC ", version: " DRIVER_VERSION "\n"); return 0; |