redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

regmap-irq: Correct error paths in regmap_irq_thread for pm_runtime 

Some error paths in regmap_irq_thread put the pm_runtime others do not,
there is no reason to leave the pm_runtime enabled in some cases so
update those paths to also put the pm_runtime.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20190812092409.21593-1-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
alistair/sunxi64-5.4-dsi
Charles Keepax 2019-08-12 10:24:09 +01:00 committed by Mark Brown
parent 5f9e832c13
commit fba5b1e9ab
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/base/regmap/regmap-irq.c
View File

@ -370,7 +370,6 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
if (ret < 0) { if (ret < 0) {
dev_err(map->dev, "IRQ thread failed to resume: %d\n", dev_err(map->dev, "IRQ thread failed to resume: %d\n",
ret); ret);
pm_runtime_put(map->dev);
goto exit; goto exit;
} }
} }
@ -425,8 +424,6 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
dev_err(map->dev, dev_err(map->dev,
"Failed to read IRQ status %d\n", "Failed to read IRQ status %d\n",
ret); ret);
if (chip->runtime_pm)
pm_runtime_put(map->dev);
goto exit; goto exit;
} }
} }
@ -478,8 +475,6 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
dev_err(map->dev, dev_err(map->dev,
"Failed to read IRQ status: %d\n", "Failed to read IRQ status: %d\n",
ret); ret);
if (chip->runtime_pm)
pm_runtime_put(map->dev);
goto exit; goto exit;
} }
} }
@ -513,10 +508,10 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
} }
} }
exit:
if (chip->runtime_pm) if (chip->runtime_pm)
pm_runtime_put(map->dev); pm_runtime_put(map->dev);
exit:
if (chip->handle_post_irq) if (chip->handle_post_irq)
chip->handle_post_irq(chip->irq_drv_data); chip->handle_post_irq(chip->irq_drv_data);