diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-07-05 08:30:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-07-05 08:30:58 +0200 |
| commit | 08f8ba07998ab1b9efcdd3f28dadf6866a605ddb (patch) | |
| tree | 8e09855446f7b0312bb729d4b539090756e57927 /drivers/usb/gadget/s3c2410_udc.c | |
| parent | perf: Fix hist_entry__tui_annotate() build failure (diff) | |
| parent | Linux 2.6.35-rc4 (diff) | |
| download | linux-08f8ba07998ab1b9efcdd3f28dadf6866a605ddb.tar.xz linux-08f8ba07998ab1b9efcdd3f28dadf6866a605ddb.zip | |
Merge commit 'v2.6.35-rc4' into perf/core
Merge reason: Pick up the latest perf fixes
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/gadget/s3c2410_udc.c')
| -rw-r--r-- | drivers/usb/gadget/s3c2410_udc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c index d5f4c1d45c97..e724a051bfdd 100644 --- a/drivers/usb/gadget/s3c2410_udc.c +++ b/drivers/usb/gadget/s3c2410_udc.c @@ -1700,9 +1700,13 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) if (!driver || driver != udc->driver || !driver->unbind) return -EINVAL; - dprintk(DEBUG_NORMAL,"usb_gadget_register_driver() '%s'\n", + dprintk(DEBUG_NORMAL, "usb_gadget_unregister_driver() '%s'\n", driver->driver.name); + /* report disconnect */ + if (driver->disconnect) + driver->disconnect(&udc->gadget); + driver->unbind(&udc->gadget); device_del(&udc->gadget.dev); |