Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 321724
b: refs/heads/master
c: 5b50d3b
h: refs/heads/master
v: v3
  • Loading branch information
Kuninori Morimoto authored and Greg Kroah-Hartman committed Aug 10, 2012
1 parent a2624ba commit d550709
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e7ae64c7545f48ae8672ae5026710794bc069979
refs/heads/master: 5b50d3b52601651ef3183cfb33d03cf486180e48
6 changes: 3 additions & 3 deletions trunk/drivers/usb/renesas_usbhs/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -603,12 +603,12 @@ static int usbhsc_resume(struct device *dev)
struct usbhs_priv *priv = dev_get_drvdata(dev);
struct platform_device *pdev = usbhs_priv_to_pdev(priv);

usbhs_platform_call(priv, phy_reset, pdev);

if (!usbhsc_flags_has(priv, USBHSF_RUNTIME_PWCTRL))
usbhsc_power_ctrl(priv, 1);

usbhsc_hotplug(priv);
usbhs_platform_call(priv, phy_reset, pdev);

usbhsc_drvcllbck_notify_hotplug(pdev);

return 0;
}
Expand Down

0 comments on commit d550709

Please sign in to comment.