]> git.baikalelectronics.ru Git - kernel.git/commit
usb: musb: omap2430: Fix regression caused by driver core change
authorTony Lindgren <tony@atomide.com>
Wed, 28 Oct 2015 17:16:04 +0000 (10:16 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 28 Oct 2015 17:16:04 +0000 (10:16 -0700)
commit0d6dbaaf32caa95ee86db82aa694588a6b8166c5
tree9375149660aed82c465c47313082ff98c33df3e1
parent1d122a1ecf21c81a8e29b4f968c00f1f66858fb9
usb: musb: omap2430: Fix regression caused by driver core change

Commit 140729794cf8 ("Driver core: wakeup the parent device before trying
probe") started automatically ensuring the parent device is enabled when
the child gets probed.

This however caused a regression for MUSB omap2430 interface as the
runtime PM for the parent device needs the child initialized to access
the MUSB hardware registers.

Let's delay the enabling of PM runtime for the parent until the child
has been properly initialized as suggested in an earlier patch by
Grygorii Strashko <grygorii.strashko@ti.com>.

In addition to delaying pm_runtime_enable, we now also need to make sure
the parent is enabled during omap2430_musb_init. We also want to propagate
an error from omap2430_runtime_resume if struct musb is not initialized.

Note that we use pm_runtime_put_noidle here for both the child and parent
to prevent an extra runtime_suspend/resume cycle.

Let's also add some comments to avoid confusion between the
two different devices.

Fixes: 140729794cf8 ("Driver core: wakeup the parent device before
trying probe")
Suggested-by: Grygorii Strashko <grygorii.strashko@ti.com>
Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
drivers/usb/musb/omap2430.c