summaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/composite.c
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2012-09-06 20:11:05 +0200
committerFelipe Balbi <balbi@ti.com>2012-09-10 15:35:16 +0300
commit93952956c7078eb41058c5ccc5b34ae6cf59bb64 (patch)
tree99f00baae3db9f776e8518525502a464f5a9c4f4 /drivers/usb/gadget/composite.c
parent03e42bd5937c4c24e411690ab165627e93c258b5 (diff)
downloadop-kernel-dev-93952956c7078eb41058c5ccc5b34ae6cf59bb64.zip
op-kernel-dev-93952956c7078eb41058c5ccc5b34ae6cf59bb64.tar.gz
usb: gadget: move bind() callback back to struct usb_gadget_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 bind callback in modpost. 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/composite.c')
-rw-r--r--drivers/usb/gadget/composite.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 071d15c..2a345f2 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1585,6 +1585,7 @@ composite_resume(struct usb_gadget *gadget)
/*-------------------------------------------------------------------------*/
static struct usb_gadget_driver composite_driver = {
+ .bind = composite_bind,
.unbind = composite_unbind,
.setup = composite_setup,
@@ -1631,7 +1632,7 @@ int usb_composite_probe(struct usb_composite_driver *driver)
composite_driver.max_speed = driver->max_speed;
composite = driver;
- return usb_gadget_probe_driver(&composite_driver, composite_bind);
+ return usb_gadget_probe_driver(&composite_driver);
}
/**
OpenPOWER on IntegriCloud