diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2012-09-06 18:11:04 (GMT) |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-09-10 12:34:48 (GMT) |
| commit | 03e42bd5937c4c24e411690ab165627e93c258b5 (patch) | |
| tree | b28ce26b26167ceeb4d3dc83dc424fd2e2ecb973 /drivers/staging/ccg | |
| parent | c2ec75c25112c9e0d9053f55ba8cf0a358d4a354 (diff) | |
| download | linux-fsl-qoriq-03e42bd5937c4c24e411690ab165627e93c258b5.tar.xz | |
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/staging/ccg')
| -rw-r--r-- | drivers/staging/ccg/ccg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/ccg/ccg.c b/drivers/staging/ccg/ccg.c index 6a7aab8..eadda55 100644 --- a/drivers/staging/ccg/ccg.c +++ b/drivers/staging/ccg/ccg.c @@ -1162,6 +1162,7 @@ static int ccg_usb_unbind(struct usb_composite_dev *cdev) static struct usb_composite_driver ccg_usb_driver = { .name = "configurable_usb", .dev = &device_desc, + .bind = ccg_bind, .unbind = ccg_usb_unbind, .needs_serial = true, .iManufacturer = "Linux Foundation", @@ -1275,7 +1276,7 @@ static int __init init(void) composite_driver.setup = ccg_setup; composite_driver.disconnect = ccg_disconnect; - err = usb_composite_probe(&ccg_usb_driver, ccg_bind); + err = usb_composite_probe(&ccg_usb_driver); if (err) { class_destroy(ccg_class); kfree(dev); |