Skip to content

Commit

Permalink
usb: phy: ab8500-usb: call phy_dis_work only when necessary
Browse files Browse the repository at this point in the history
Modify ab8500_usb_set_peripheral() and ab8500_usb_set_host() code to
schedule phy_dis_work only when necessary in order to prevent regulator
count mismatch during reboot/shutdown.

Signed-off-by: Sakethram Bommisetti <sakethram.bommisetti@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Sakethram Bommisetti authored and Felipe Balbi committed Apr 3, 2013
1 parent 8db1223 commit 5882337
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions drivers/usb/phy/phy-ab8500-usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -614,17 +614,16 @@ static int ab8500_usb_set_peripheral(struct usb_otg *otg,

ab = phy_to_ab(otg->phy);

ab->phy.otg->gadget = gadget;

/* Some drivers call this function in atomic context.
* Do not update ab8500 registers directly till this
* is fixed.
*/

if (!gadget) {
otg->gadget = NULL;
if ((ab->mode != USB_IDLE) && (!gadget)) {
ab->mode = USB_IDLE;
schedule_work(&ab->phy_dis_work);
} else {
otg->gadget = gadget;
otg->phy->state = OTG_STATE_B_IDLE;
}

return 0;
Expand All @@ -639,16 +638,16 @@ static int ab8500_usb_set_host(struct usb_otg *otg, struct usb_bus *host)

ab = phy_to_ab(otg->phy);

ab->phy.otg->host = host;

/* Some drivers call this function in atomic context.
* Do not update ab8500 registers directly till this
* is fixed.
*/

if (!host) {
otg->host = NULL;
if ((ab->mode != USB_IDLE) && (!host)) {
ab->mode = USB_IDLE;
schedule_work(&ab->phy_dis_work);
} else {
otg->host = host;
}

return 0;
Expand Down

0 comments on commit 5882337

Please sign in to comment.