diff options
| author | Felipe Balbi | 2014-03-28 20:31:47 +0100 |
|---|---|---|
| committer | Felipe Balbi | 2014-04-15 19:07:33 +0200 |
| commit | 3063a12be2b07c64e9802708a19489342e64c1a3 (patch) | |
| tree | 4e6d225a2bc7aadc6108c6a826937478587e4010 /drivers/usb/musb/omap2430.c | |
| parent | Linux 3.15-rc1 (diff) | |
| download | kernel-qcow2-linux-3063a12be2b07c64e9802708a19489342e64c1a3.tar.gz kernel-qcow2-linux-3063a12be2b07c64e9802708a19489342e64c1a3.tar.xz kernel-qcow2-linux-3063a12be2b07c64e9802708a19489342e64c1a3.zip | |
usb: musb: fix PHY power on/off
commi 30a70b0 (usb: musb: fix obex in g_nokia.ko
causing kernel panic) removed phy_power_on()
and phy_power_off() calls from runtime PM callbacks
but it failed to note that the driver depended
on pm_runtime_get_sync() calls to power up the PHY,
thus leaving some platforms without any means to
have a working PHY.
Fix that by enabling the phy during omap2430_musb_init()
and killing it in omap2430_musb_exit().
Fixes: 30a70b0 (usb: musb: fix obex in g_nokia.ko causing kernel panic)
Cc: <stable@vger.kernel.org> # v3.14
Cc: Pali Rohár <pali.rohar@gmail.com>
Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Reported-by: Michael Scott <hashcode0f@gmail.com>
Tested-by: Michael Scott <hashcode0f@gmail.com>
Tested-by: Stefan Roese <sr@denx.de>
Reported-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb/omap2430.c')
| -rw-r--r-- | drivers/usb/musb/omap2430.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index d341c149a2f9..819a7cdcb866 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c @@ -416,6 +416,7 @@ static int omap2430_musb_init(struct musb *musb) omap_musb_set_mailbox(glue); phy_init(musb->phy); + phy_power_on(musb->phy); pm_runtime_put_noidle(musb->controller); return 0; @@ -478,6 +479,7 @@ static int omap2430_musb_exit(struct musb *musb) del_timer_sync(&musb_idle_timer); omap2430_low_level_exit(musb); + phy_power_off(musb->phy); phy_exit(musb->phy); return 0; |