diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2012-09-06 14:11:04 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2012-09-10 08:34:48 -0400 |
commit | 03e42bd5937c4c24e411690ab165627e93c258b5 (patch) | |
tree | b28ce26b26167ceeb4d3dc83dc424fd2e2ecb973 /drivers/usb/gadget/webcam.c | |
parent | c2ec75c25112c9e0d9053f55ba8cf0a358d4a354 (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/webcam.c')
-rw-r--r-- | drivers/usb/gadget/webcam.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/webcam.c b/drivers/usb/gadget/webcam.c index d946f19482e8..2a617c3f5a40 100644 --- a/drivers/usb/gadget/webcam.c +++ b/drivers/usb/gadget/webcam.c | |||
@@ -395,13 +395,14 @@ static __refdata struct usb_composite_driver webcam_driver = { | |||
395 | .dev = &webcam_device_descriptor, | 395 | .dev = &webcam_device_descriptor, |
396 | .strings = webcam_device_strings, | 396 | .strings = webcam_device_strings, |
397 | .max_speed = USB_SPEED_SUPER, | 397 | .max_speed = USB_SPEED_SUPER, |
398 | .bind = webcam_bind, | ||
398 | .unbind = webcam_unbind, | 399 | .unbind = webcam_unbind, |
399 | }; | 400 | }; |
400 | 401 | ||
401 | static int __init | 402 | static int __init |
402 | webcam_init(void) | 403 | webcam_init(void) |
403 | { | 404 | { |
404 | return usb_composite_probe(&webcam_driver, webcam_bind); | 405 | return usb_composite_probe(&webcam_driver); |
405 | } | 406 | } |
406 | 407 | ||
407 | static void __exit | 408 | static void __exit |