aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/serial.c
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2012-09-06 14:11:04 -0400
committerFelipe Balbi <balbi@ti.com>2012-09-10 08:34:48 -0400
commit03e42bd5937c4c24e411690ab165627e93c258b5 (patch)
treeb28ce26b26167ceeb4d3dc83dc424fd2e2ecb973 /drivers/usb/gadget/serial.c
parentc2ec75c25112c9e0d9053f55ba8cf0a358d4a354 (diff)
usb: gadget: move bind() callback back to struct usb_composite_driver
This partly reverts 07a18bd7 ("usb gadget: don't save bind callback in struct usb_composite_driver") and fixes new drivers. The section missmatch problems was solved by whitelisting structs in question via __ref. Cc: devel@driverdev.osuosl.org 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/serial.c')
-rw-r--r--drivers/usb/gadget/serial.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 7b0b6f40ed07..ea3f8e9344ae 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -243,6 +243,7 @@ static __refdata struct usb_composite_driver gserial_driver = {
243 .dev = &device_desc, 243 .dev = &device_desc,
244 .strings = dev_strings, 244 .strings = dev_strings,
245 .max_speed = USB_SPEED_SUPER, 245 .max_speed = USB_SPEED_SUPER,
246 .bind = gs_bind,
246}; 247};
247 248
248static int __init init(void) 249static int __init init(void)
@@ -271,7 +272,7 @@ static int __init init(void)
271 } 272 }
272 strings_dev[STRING_DESCRIPTION_IDX].s = serial_config_driver.label; 273 strings_dev[STRING_DESCRIPTION_IDX].s = serial_config_driver.label;
273 274
274 return usb_composite_probe(&gserial_driver, gs_bind); 275 return usb_composite_probe(&gserial_driver);
275} 276}
276module_init(init); 277module_init(init);
277 278