aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/gadget/inode.c')
-rw-r--r--drivers/usb/gadget/inode.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 3f1d771c8be5..d1d72d946b04 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1774,7 +1774,6 @@ static struct usb_gadget_driver gadgetfs_driver = {
1774 .speed = USB_SPEED_FULL, 1774 .speed = USB_SPEED_FULL,
1775#endif 1775#endif
1776 .function = (char *) driver_desc, 1776 .function = (char *) driver_desc,
1777 .bind = gadgetfs_bind,
1778 .unbind = gadgetfs_unbind, 1777 .unbind = gadgetfs_unbind,
1779 .setup = gadgetfs_setup, 1778 .setup = gadgetfs_setup,
1780 .disconnect = gadgetfs_disconnect, 1779 .disconnect = gadgetfs_disconnect,
@@ -1797,7 +1796,6 @@ static int gadgetfs_probe (struct usb_gadget *gadget)
1797 1796
1798static struct usb_gadget_driver probe_driver = { 1797static struct usb_gadget_driver probe_driver = {
1799 .speed = USB_SPEED_HIGH, 1798 .speed = USB_SPEED_HIGH,
1800 .bind = gadgetfs_probe,
1801 .unbind = gadgetfs_nop, 1799 .unbind = gadgetfs_nop,
1802 .setup = (void *)gadgetfs_nop, 1800 .setup = (void *)gadgetfs_nop,
1803 .disconnect = gadgetfs_nop, 1801 .disconnect = gadgetfs_nop,
@@ -1907,7 +1905,7 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
1907 1905
1908 /* triggers gadgetfs_bind(); then we can enumerate. */ 1906 /* triggers gadgetfs_bind(); then we can enumerate. */
1909 spin_unlock_irq (&dev->lock); 1907 spin_unlock_irq (&dev->lock);
1910 value = usb_gadget_register_driver (&gadgetfs_driver); 1908 value = usb_gadget_probe_driver(&gadgetfs_driver, gadgetfs_bind);
1911 if (value != 0) { 1909 if (value != 0) {
1912 kfree (dev->buf); 1910 kfree (dev->buf);
1913 dev->buf = NULL; 1911 dev->buf = NULL;
@@ -2046,7 +2044,7 @@ gadgetfs_fill_super (struct super_block *sb, void *opts, int silent)
2046 return -ESRCH; 2044 return -ESRCH;
2047 2045
2048 /* fake probe to determine $CHIP */ 2046 /* fake probe to determine $CHIP */
2049 (void) usb_gadget_register_driver (&probe_driver); 2047 (void) usb_gadget_probe_driver(&probe_driver, gadgetfs_probe);
2050 if (!CHIP) 2048 if (!CHIP)
2051 return -ENODEV; 2049 return -ENODEV;
2052 2050