diff options
author | Kevin Hilman <khilman@ti.com> | 2012-07-10 15:29:04 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2012-09-12 10:51:56 -0700 |
commit | 72bb6f9b51c82c820ddef892455a85b115460904 (patch) | |
tree | 1b1fd1b1b04e53b3d8ecbef706e69e396f1010a6 | |
parent | e753345bec8fef81d1e87710917f89dc75f39b2a (diff) | |
download | blackbird-op-linux-72bb6f9b51c82c820ddef892455a85b115460904.tar.gz blackbird-op-linux-72bb6f9b51c82c820ddef892455a85b115460904.zip |
ARM: OMAP: omap_device: don't attempt late suspend if no driver bound
Currently, the omap_device PM domain layer uses the late suspend and
early resume callbacks to ensure devices are in their low power
states.
However, this is attempted even in cases where a driver probe has
failed. If a driver's ->probe() method fails, the driver is likely in
a state where it is not expecting its runtime PM callbacks to be
called, yet currently the omap_device PM domain code attempts to call
the drivers callbacks.
To fix, use the omap_device driver_status field to check whether a
driver is bound to the omap_device before attempting to trigger driver
callbacks.
Reviewed-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
-rw-r--r-- | arch/arm/plat-omap/omap_device.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c index 1d1b5ff78306..150112e3ffc8 100644 --- a/arch/arm/plat-omap/omap_device.c +++ b/arch/arm/plat-omap/omap_device.c @@ -756,6 +756,10 @@ static int _od_suspend_noirq(struct device *dev) struct omap_device *od = to_omap_device(pdev); int ret; + /* Don't attempt late suspend on a driver that is not bound */ + if (od->_driver_status != BUS_NOTIFY_BOUND_DRIVER) + return 0; + ret = pm_generic_suspend_noirq(dev); if (!ret && !pm_runtime_status_suspended(dev)) { |