summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDinghao Liu <dinghao.liu@zju.edu.cn>2020-05-22 18:40:06 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-01 13:14:47 +0200
commit2138dc84dfef7b0add7ccc034cdc4ad86754c715 (patch)
treeaf8b79174e4cd83522eed41f845842c74ff676ff
parent345d68b47a05e455de5048bd3ed8e9aa5abb430c (diff)
downloadlinux-stable-2138dc84dfef7b0add7ccc034cdc4ad86754c715.tar.gz
linux-stable-2138dc84dfef7b0add7ccc034cdc4ad86754c715.tar.bz2
linux-stable-2138dc84dfef7b0add7ccc034cdc4ad86754c715.zip
mtd: rawnand: omap_elm: Fix runtime PM imbalance on error
[ Upstream commit 37f7212148cf1d796135cdf8d0c7fee13067674b ] pm_runtime_get_sync() increments the runtime PM usage counter even when it returns an error code. Thus a pairing decrement is needed on the error handling path to keep the counter balanced. Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20200522104008.28340-1-dinghao.liu@zju.edu.cn Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/mtd/nand/raw/omap_elm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/nand/raw/omap_elm.c b/drivers/mtd/nand/raw/omap_elm.c
index a3f32f939cc1..6736777a4156 100644
--- a/drivers/mtd/nand/raw/omap_elm.c
+++ b/drivers/mtd/nand/raw/omap_elm.c
@@ -421,6 +421,7 @@ static int elm_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev);
if (pm_runtime_get_sync(&pdev->dev) < 0) {
ret = -EINVAL;
+ pm_runtime_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev);
dev_err(&pdev->dev, "can't enable clock\n");
return ret;