Skip to content

Commit

Permalink
usb: s3c-hsotg: fix unregistration function
Browse files Browse the repository at this point in the history
After driver conversion to udc_start/udc_stop infrastructure (commit
"usb:hsotg:samsung: Use new udc_start and udc_stop callbacks"
f65f0f1) the gadget unregistration function is almost always called
with 'driver' parameter being NULL, what caused that the unregistration
code has not been executed at all. This is a leftover from the earlier
verison of this function (which used simple start/stop interface), where
driver parameter was obligatory.

This patch removes the NULL check for the 'driver' pointer and removes
all dereferences of it. It also moves disabling voltage regulators out
of the atomic context, because handling regulators (which are usually
i2c devices) might require sleeping.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Marek Szyprowski authored and Felipe Balbi committed Sep 17, 2013
1 parent 7f2ccc8 commit c8c1025
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions drivers/usb/gadget/s3c-hsotg.c
Original file line number Diff line number Diff line change
Expand Up @@ -2962,25 +2962,22 @@ static int s3c_hsotg_udc_stop(struct usb_gadget *gadget,
if (!hsotg)
return -ENODEV;

if (!driver || driver != hsotg->driver || !driver->unbind)
return -EINVAL;

/* all endpoints should be shutdown */
for (ep = 0; ep < hsotg->num_of_eps; ep++)
s3c_hsotg_ep_disable(&hsotg->eps[ep].ep);

spin_lock_irqsave(&hsotg->lock, flags);

s3c_hsotg_phy_disable(hsotg);
regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);

hsotg->driver = NULL;
if (!driver)
hsotg->driver = NULL;

hsotg->gadget.speed = USB_SPEED_UNKNOWN;

spin_unlock_irqrestore(&hsotg->lock, flags);

dev_info(hsotg->dev, "unregistered gadget driver '%s'\n",
driver->driver.name);
regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);

return 0;
}
Expand Down

0 comments on commit c8c1025

Please sign in to comment.