aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/usb
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2012-09-10 09:01:54 -0400
committerFelipe Balbi <balbi@ti.com>2012-09-10 09:13:00 -0400
commit1cf0d264088907038be560ba2dd472d5e432a3dc (patch)
treec62973c662c6c43763f672e65d8ae167e39686cc /include/linux/usb
parent276e2e4f1f3e07a0ad891bf757dbcfd655ff5f91 (diff)
usb: gadget: push iSerialNumber into gadgets
This patch pushes the iSerialNumber module argument from composite into each gadget. Once the user uses the module paramter, the string is overwritten with the final value. 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.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index f821a3ad475d..9d068a4be778 100644
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -400,6 +400,7 @@ struct usb_composite_overwrite {
400 u16 idVendor; 400 u16 idVendor;
401 u16 idProduct; 401 u16 idProduct;
402 u16 bcdDevice; 402 u16 bcdDevice;
403 char *serial_number;
403}; 404};
404#define USB_GADGET_COMPOSITE_OPTIONS() \ 405#define USB_GADGET_COMPOSITE_OPTIONS() \
405 static struct usb_composite_overwrite coverwrite; \ 406 static struct usb_composite_overwrite coverwrite; \
@@ -411,7 +412,11 @@ struct usb_composite_overwrite {
411 MODULE_PARM_DESC(idProduct, "USB Product ID"); \ 412 MODULE_PARM_DESC(idProduct, "USB Product ID"); \
412 \ 413 \
413 module_param_named(bcdDevice, coverwrite.bcdDevice, ushort, S_IRUGO); \ 414 module_param_named(bcdDevice, coverwrite.bcdDevice, ushort, S_IRUGO); \
414 MODULE_PARM_DESC(bcdDevice, "USB Device version (BCD)") 415 MODULE_PARM_DESC(bcdDevice, "USB Device version (BCD)"); \
416 \
417 module_param_named(iSerialNumber, coverwrite.serial_number, charp, \
418 S_IRUGO); \
419 MODULE_PARM_DESC(iSerialNumber, "SerialNumber string")
415 420
416void usb_composite_overwrite_options(struct usb_composite_dev *cdev, 421void usb_composite_overwrite_options(struct usb_composite_dev *cdev,
417 struct usb_composite_overwrite *covr); 422 struct usb_composite_overwrite *covr);