Current system PM methods for this driver race with the runtime PM methods when an i2c xfer is in progress when the system suspend path is excuted.
These callbacks are only needed when runtime PM is disabled from userspace, so for now we accept that this device will not hit retention, even in suspend, if runtime PM disabled. The correct fix (forthcoming) for v3.0+ is to use device power domain callbacks at the system PM level to handle this, but for now, this avoids the race. Signed-off-by: Kevin Hilman <[email protected]> --- drivers/i2c/busses/i2c-omap.c | 20 -------------------- 1 files changed, 0 insertions(+), 20 deletions(-) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 4e3256f..77ed95f 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -1150,27 +1150,7 @@ static int omap_i2c_runtime_resume(struct device *dev) return 0; } -static int omap_i2c_suspend(struct device *dev) -{ - if (!pm_runtime_suspended(dev)) - if (dev->bus && dev->bus->pm && dev->bus->pm->runtime_suspend) - dev->bus->pm->runtime_suspend(dev); - - return 0; -} - -static int omap_i2c_resume(struct device *dev) -{ - if (!pm_runtime_suspended(dev)) - if (dev->bus && dev->bus->pm && dev->bus->pm->runtime_resume) - dev->bus->pm->runtime_resume(dev); - - return 0; -} - static struct dev_pm_ops omap_i2c_pm_ops = { - .suspend = omap_i2c_suspend, - .resume = omap_i2c_resume, .runtime_suspend = omap_i2c_runtime_suspend, .runtime_resume = omap_i2c_runtime_resume, }; -- 1.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
