diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 23:30:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 23:30:48 -0400 |
commit | 5cc103506289de7ee0a0b526ae0381541990cad4 (patch) | |
tree | ae8a4958e70c6d1295030b40e333dcc007b3c074 /drivers/usb/gadget/pxa25x_udc.c | |
parent | 73ecf3a6e3f0206bf56a0fefe3b3eda042fb7034 (diff) | |
parent | 92ca0dc5ee022e4c0e488177e1d8865a0778c6c2 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (141 commits)
USB: mct_u232: fix broken close
USB: gadget: amd5536udc.c: fix error path
USB: imx21-hcd - fix off by one resource size calculation
usb: gadget: fix Kconfig warning
usb: r8a66597-udc: Add processing when USB was removed.
mxc_udc: add workaround for ENGcm09152 for i.MX35
USB: ftdi_sio: add device ids for ScienceScope
USB: musb: AM35x: Workaround for fifo read issue
USB: musb: add musb support for AM35x
USB: AM35x: Add musb support
usb: Fix linker errors with CONFIG_PM=n
USB: ohci-sh - use resource_size instead of defining its own resource_len macro
USB: isp1362-hcd - use resource_size instead of defining its own resource_len macro
USB: isp116x-hcd - use resource_size instead of defining its own resource_len macro
USB: xhci: Fix compile error when CONFIG_PM=n
USB: accept some invalid ep0-maxpacket values
USB: xHCI: PCI power management implementation
USB: xHCI: bus power management implementation
USB: xHCI: port remote wakeup implementation
USB: xHCI: port power management implementation
...
Manually fix up (non-data) conflict: the SCSI merge gad renamed the
'hw_sector_size' member to 'physical_block_size', and the USB tree
brought a new use of it.
Diffstat (limited to 'drivers/usb/gadget/pxa25x_udc.c')
-rw-r--r-- | drivers/usb/gadget/pxa25x_udc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index be5fb34d9602..b37f92cb71bc 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c | |||
@@ -1280,14 +1280,15 @@ static void udc_enable (struct pxa25x_udc *dev) | |||
1280 | * disconnect is reported. then a host may connect again, or | 1280 | * disconnect is reported. then a host may connect again, or |
1281 | * the driver might get unbound. | 1281 | * the driver might get unbound. |
1282 | */ | 1282 | */ |
1283 | int usb_gadget_register_driver(struct usb_gadget_driver *driver) | 1283 | int usb_gadget_probe_driver(struct usb_gadget_driver *driver, |
1284 | int (*bind)(struct usb_gadget *)) | ||
1284 | { | 1285 | { |
1285 | struct pxa25x_udc *dev = the_controller; | 1286 | struct pxa25x_udc *dev = the_controller; |
1286 | int retval; | 1287 | int retval; |
1287 | 1288 | ||
1288 | if (!driver | 1289 | if (!driver |
1289 | || driver->speed < USB_SPEED_FULL | 1290 | || driver->speed < USB_SPEED_FULL |
1290 | || !driver->bind | 1291 | || !bind |
1291 | || !driver->disconnect | 1292 | || !driver->disconnect |
1292 | || !driver->setup) | 1293 | || !driver->setup) |
1293 | return -EINVAL; | 1294 | return -EINVAL; |
@@ -1308,7 +1309,7 @@ fail: | |||
1308 | dev->gadget.dev.driver = NULL; | 1309 | dev->gadget.dev.driver = NULL; |
1309 | return retval; | 1310 | return retval; |
1310 | } | 1311 | } |
1311 | retval = driver->bind(&dev->gadget); | 1312 | retval = bind(&dev->gadget); |
1312 | if (retval) { | 1313 | if (retval) { |
1313 | DMSG("bind to driver %s --> error %d\n", | 1314 | DMSG("bind to driver %s --> error %d\n", |
1314 | driver->driver.name, retval); | 1315 | driver->driver.name, retval); |
@@ -1338,7 +1339,7 @@ fail: | |||
1338 | bind_fail: | 1339 | bind_fail: |
1339 | return retval; | 1340 | return retval; |
1340 | } | 1341 | } |
1341 | EXPORT_SYMBOL(usb_gadget_register_driver); | 1342 | EXPORT_SYMBOL(usb_gadget_probe_driver); |
1342 | 1343 | ||
1343 | static void | 1344 | static void |
1344 | stop_activity(struct pxa25x_udc *dev, struct usb_gadget_driver *driver) | 1345 | stop_activity(struct pxa25x_udc *dev, struct usb_gadget_driver *driver) |