]> git.karo-electronics.de Git - linux-beck.git/commitdiff
HSI: omap_ssi_core: remove pm_runtime_get_sync call from tasklet
authorSebastian Reichel <sre@kernel.org>
Fri, 17 Jun 2016 19:01:36 +0000 (21:01 +0200)
committerSebastian Reichel <sre@kernel.org>
Mon, 27 Jun 2016 22:39:26 +0000 (00:39 +0200)
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>
drivers/hsi/controllers/omap_ssi_core.c

index 618db80577c3bf632d5fbe46d1117d6876be6935..79562ce65579d7bf62ddd8d769a9522f2cf83e6c 100644 (file)
@@ -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++) {