From b0277ae842389c83adb259b353620514ee13f6b3 Mon Sep 17 00:00:00 2001 From: Pavankumar Kondeti Date: Tue, 11 Jan 2011 09:19:21 +0530 Subject: [PATCH] --- yaml --- r: 232643 b: refs/heads/master c: 49d3df53a80deed2251b91f50ae9e1c5caf7ded7 h: refs/heads/master i: 232641: 53ccd44d402348c9c602e881276ff256c8ce2c3e 232639: 48c56eb32927253c62d9521a5b32f3d6df4805d8 v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/ci13xxx_udc.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 99979deaf040..6410112592f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15680cdfc69a7277ba87a8a3a3242d67c4ba5916 +refs/heads/master: 49d3df53a80deed2251b91f50ae9e1c5caf7ded7 diff --git a/trunk/drivers/usb/gadget/ci13xxx_udc.c b/trunk/drivers/usb/gadget/ci13xxx_udc.c index 31656a2b4ab4..b0b90621dc1b 100644 --- a/trunk/drivers/usb/gadget/ci13xxx_udc.c +++ b/trunk/drivers/usb/gadget/ci13xxx_udc.c @@ -2427,7 +2427,6 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver, info("hw_ep_max = %d", hw_ep_max); - udc->driver = driver; udc->gadget.dev.driver = NULL; retval = 0; @@ -2479,6 +2478,7 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver, goto done; } + udc->driver = driver; pm_runtime_get_sync(&udc->gadget.dev); if (udc->udc_driver->flags & CI13XXX_PULLUP_ON_VBUS) { if (udc->vbus_active) { @@ -2496,8 +2496,6 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver, done: spin_unlock_irqrestore(udc->lock, flags); - if (retval) - usb_gadget_unregister_driver(driver); return retval; } EXPORT_SYMBOL(usb_gadget_probe_driver);