diff options
author | Felipe Balbi <balbi@ti.com> | 2013-02-26 07:36:21 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2013-03-18 05:17:39 -0400 |
commit | 68abc94f8de89ef885332a101654a0aef2db6d97 (patch) | |
tree | 713cc7d60b4a798a65eadf995c0e1f9ade0781bd /drivers/usb/gadget/net2280.c | |
parent | 812abae5d66ce1a7a102afe1b3564df597687e79 (diff) |
usb: gadget: net2280: don't touch gadget.dev.driver
udc-core now handles that for us, which means
we can remove it from our driver.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/net2280.c')
-rw-r--r-- | drivers/usb/gadget/net2280.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c index 6ce25133c14c..9e4f0a26108e 100644 --- a/drivers/usb/gadget/net2280.c +++ b/drivers/usb/gadget/net2280.c | |||
@@ -1896,7 +1896,6 @@ static int net2280_start(struct usb_gadget *_gadget, | |||
1896 | dev->softconnect = 1; | 1896 | dev->softconnect = 1; |
1897 | driver->driver.bus = NULL; | 1897 | driver->driver.bus = NULL; |
1898 | dev->driver = driver; | 1898 | dev->driver = driver; |
1899 | dev->gadget.dev.driver = &driver->driver; | ||
1900 | 1899 | ||
1901 | retval = device_create_file (&dev->pdev->dev, &dev_attr_function); | 1900 | retval = device_create_file (&dev->pdev->dev, &dev_attr_function); |
1902 | if (retval) goto err_unbind; | 1901 | if (retval) goto err_unbind; |
@@ -1925,7 +1924,6 @@ err_func: | |||
1925 | device_remove_file (&dev->pdev->dev, &dev_attr_function); | 1924 | device_remove_file (&dev->pdev->dev, &dev_attr_function); |
1926 | err_unbind: | 1925 | err_unbind: |
1927 | driver->unbind (&dev->gadget); | 1926 | driver->unbind (&dev->gadget); |
1928 | dev->gadget.dev.driver = NULL; | ||
1929 | dev->driver = NULL; | 1927 | dev->driver = NULL; |
1930 | return retval; | 1928 | return retval; |
1931 | } | 1929 | } |
@@ -1961,7 +1959,6 @@ static int net2280_stop(struct usb_gadget *_gadget, | |||
1961 | stop_activity (dev, driver); | 1959 | stop_activity (dev, driver); |
1962 | spin_unlock_irqrestore (&dev->lock, flags); | 1960 | spin_unlock_irqrestore (&dev->lock, flags); |
1963 | 1961 | ||
1964 | dev->gadget.dev.driver = NULL; | ||
1965 | dev->driver = NULL; | 1962 | dev->driver = NULL; |
1966 | 1963 | ||
1967 | net2280_led_active (dev, 0); | 1964 | net2280_led_active (dev, 0); |