diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2012-09-10 09:01:56 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2012-09-10 09:13:01 -0400 |
commit | 2d35ee47aaafac152bc4bc5020660ffa1753ab02 (patch) | |
tree | ea95206a5e772602b3e46de8e486d2c6a934db40 /include/linux/usb | |
parent | 03de9bf69c589b71c43aa52b838690cb477903c9 (diff) |
usb: gadget: push iProduct into gadgets
This patch pushes the iProduct module argument from composite
into each gadget.
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 'include/linux/usb')
-rw-r--r-- | include/linux/usb/composite.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index 86553c8c3e8..5cd110ec0a2 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h | |||
@@ -402,6 +402,7 @@ struct usb_composite_overwrite { | |||
402 | u16 bcdDevice; | 402 | u16 bcdDevice; |
403 | char *serial_number; | 403 | char *serial_number; |
404 | char *manufacturer; | 404 | char *manufacturer; |
405 | char *product; | ||
405 | }; | 406 | }; |
406 | #define USB_GADGET_COMPOSITE_OPTIONS() \ | 407 | #define USB_GADGET_COMPOSITE_OPTIONS() \ |
407 | static struct usb_composite_overwrite coverwrite; \ | 408 | static struct usb_composite_overwrite coverwrite; \ |
@@ -421,7 +422,10 @@ struct usb_composite_overwrite { | |||
421 | \ | 422 | \ |
422 | module_param_named(iManufacturer, coverwrite.manufacturer, charp, \ | 423 | module_param_named(iManufacturer, coverwrite.manufacturer, charp, \ |
423 | S_IRUGO); \ | 424 | S_IRUGO); \ |
424 | MODULE_PARM_DESC(iManufacturer, "USB Manufacturer string") | 425 | MODULE_PARM_DESC(iManufacturer, "USB Manufacturer string"); \ |
426 | \ | ||
427 | module_param_named(iProduct, coverwrite.product, charp, S_IRUGO); \ | ||
428 | MODULE_PARM_DESC(iProduct, "USB Product string") | ||
425 | 429 | ||
426 | void usb_composite_overwrite_options(struct usb_composite_dev *cdev, | 430 | void usb_composite_overwrite_options(struct usb_composite_dev *cdev, |
427 | struct usb_composite_overwrite *covr); | 431 | struct usb_composite_overwrite *covr); |