diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2012-09-10 13:01:53 (GMT) |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-09-10 13:12:59 (GMT) |
| commit | 7d16e8d3eb704f5f6eb5a271d5758b495634e8e6 (patch) | |
| tree | 146c2f02239fc5df53976092384bc74ed29f7c02 /drivers/usb/gadget/cdc2.c | |
| parent | 3b4a3fc0ba83265c0bfcfdfc3416e65e47441747 (diff) | |
| download | linux-fsl-qoriq-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/cdc2.c')
| -rw-r--r-- | drivers/usb/gadget/cdc2.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/cdc2.c b/drivers/usb/gadget/cdc2.c index 3b89fe2..93a7580 100644 --- a/drivers/usb/gadget/cdc2.c +++ b/drivers/usb/gadget/cdc2.c @@ -34,6 +34,7 @@ #define CDC_PRODUCT_NUM 0xa4aa /* CDC Composite: ECM + ACM */ /*-------------------------------------------------------------------------*/ +USB_GADGET_COMPOSITE_OPTIONS(); /* * Kbuild is not very cooperative with respect to linking separately @@ -204,6 +205,7 @@ static int __init cdc_bind(struct usb_composite_dev *cdev) if (status < 0) goto fail1; + usb_composite_overwrite_options(cdev, &coverwrite); dev_info(&gadget->dev, "%s, version: " DRIVER_VERSION "\n", DRIVER_DESC); |