aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDima Zavin <dima@android.com>2011-01-05 16:12:44 -0800
committerDima Zavin <dima@android.com>2011-01-05 16:12:44 -0800
commit8d44465085ba837f62d8424f573ff55bea55272d (patch)
treee0f16efc5b237815adf952ad2442bc23293760a6
parentec84a9023f7e2f653b037dbc3544e9c0e45ec16c (diff)
downloadexperimental-8d44465085ba837f62d8424f573ff55bea55272d.tar.gz
usb: gadget: msm: fix driver registration on 2.6.37
Change-Id: Iac47f5c689b3846ca6162ceb53ce51bd432c00a0 Signed-off-by: Dima Zavin <dima@android.com>
-rw-r--r--drivers/usb/gadget/msm72k_udc.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/gadget/msm72k_udc.c b/drivers/usb/gadget/msm72k_udc.c
index 9b0e697f972..3ae42edc037 100644
--- a/drivers/usb/gadget/msm72k_udc.c
+++ b/drivers/usb/gadget/msm72k_udc.c
@@ -1821,14 +1821,15 @@ static int msm72k_probe(struct platform_device *pdev)
return 0;
}
-int usb_gadget_register_driver(struct usb_gadget_driver *driver)
+int usb_gadget_probe_driver(struct usb_gadget_driver *driver,
+ int (*bind)(struct usb_gadget *))
{
struct usb_info *ui = the_usb_info;
int retval, n;
if (!driver
|| driver->speed < USB_SPEED_FULL
- || !driver->bind
+ || !bind
|| !driver->disconnect
|| !driver->setup)
return -EINVAL;
@@ -1861,7 +1862,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
if (retval)
goto fail;
- retval = driver->bind(&ui->gadget);
+ retval = bind(&ui->gadget);
if (retval) {
INFO("bind to driver %s --> error %d\n",
driver->driver.name, retval);
@@ -1885,7 +1886,7 @@ fail:
ui->gadget.dev.driver = NULL;
return retval;
}
-EXPORT_SYMBOL(usb_gadget_register_driver);
+EXPORT_SYMBOL(usb_gadget_probe_driver);
int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
{