diff options
author | Sebastian Reichel <sre@kernel.org> | 2016-06-17 21:01:36 +0200 |
---|---|---|
committer | Sebastian Reichel <sre@kernel.org> | 2016-06-28 00:39:26 +0200 |
commit | 927d3f8f73217fb19c28496321510335176955de (patch) | |
tree | ffcb72e224c81997a89fb98a6dd16c16b91a28e8 | |
parent | ea88f717cdbe94e60bf2b0082648453cf2401ffc (diff) | |
download | linux-stable-927d3f8f73217fb19c28496321510335176955de.tar.gz linux-stable-927d3f8f73217fb19c28496321510335176955de.tar.bz2 linux-stable-927d3f8f73217fb19c28496321510335176955de.zip |
HSI: omap_ssi_core: remove pm_runtime_get_sync call from tasklet
We may not call pm_runtime_get_sync() from tasklet, since
it can block once pm_runtime_irq_safe is removed for omap-ssi.
Since irq can should only be created for a running device,
we assume, that the device is already running and use non-
synchronous API instead.
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Tested-by: Pavel Machek <pavel@ucw.cz>
-rw-r--r-- | drivers/hsi/controllers/omap_ssi_core.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/hsi/controllers/omap_ssi_core.c b/drivers/hsi/controllers/omap_ssi_core.c index 618db80577c3..79562ce65579 100644 --- a/drivers/hsi/controllers/omap_ssi_core.c +++ b/drivers/hsi/controllers/omap_ssi_core.c @@ -255,7 +255,13 @@ static void ssi_gdd_tasklet(unsigned long dev) unsigned int lch; u32 status_reg; - pm_runtime_get_sync(ssi->device.parent); + pm_runtime_get(ssi->device.parent); + + if (!pm_runtime_active(ssi->device.parent)) { + dev_warn(ssi->device.parent, "ssi_gdd_tasklet called without runtime PM!\n"); + pm_runtime_put(ssi->device.parent); + return; + } status_reg = readl(sys + SSI_GDD_MPU_IRQ_STATUS_REG); for (lch = 0; lch < SSI_MAX_GDD_LCH; lch++) { |