diff options
Diffstat (limited to 'meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0019-Revert-Revert-hwspinlock-rcar-Add-pm_runtime_disable.patch')
-rw-r--r-- | meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0019-Revert-Revert-hwspinlock-rcar-Add-pm_runtime_disable.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0019-Revert-Revert-hwspinlock-rcar-Add-pm_runtime_disable.patch b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0019-Revert-Revert-hwspinlock-rcar-Add-pm_runtime_disable.patch new file mode 100644 index 0000000..7c70c42 --- /dev/null +++ b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0019-Revert-Revert-hwspinlock-rcar-Add-pm_runtime_disable.patch @@ -0,0 +1,44 @@ +From 6f3c87b79a086e94df4bb93bae56b13797ca7478 Mon Sep 17 00:00:00 2001 +From: Hiroki Negishi <hiroki.negishi.bx@renesas.com> +Date: Mon, 13 Nov 2017 12:00:51 +0900 +Subject: [PATCH 19/23] Revert "Revert "hwspinlock: rcar: Add + pm_runtime_disable if probe is failed."" + +This reverts commit 9242bfb6e240 ("Revert "hwspinlock: rcar: Add +pm_runtime_disable if probe is failed."") + +Signed-off-by: Hiroki Negishi <hiroki.negishi.bx@renesas.com> +--- + drivers/hwspinlock/rcar_hwspinlock.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/hwspinlock/rcar_hwspinlock.c b/drivers/hwspinlock/rcar_hwspinlock.c +index e089d9a..b92db1b 100644 +--- a/drivers/hwspinlock/rcar_hwspinlock.c ++++ b/drivers/hwspinlock/rcar_hwspinlock.c +@@ -60,8 +60,6 @@ static int rcar_hwspinlock_probe(struct platform_device *pdev) + struct hwspinlock *lock; + struct resource *res = NULL; + +- pm_runtime_enable(&pdev->dev); +- + /* map MFIS register */ + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + addr = (u32 __iomem *)devm_ioremap_nocache(&pdev->dev, +@@ -88,9 +86,13 @@ static int rcar_hwspinlock_probe(struct platform_device *pdev) + } + platform_set_drvdata(pdev, bank); + ++ pm_runtime_enable(&pdev->dev); ++ + /* register hwspinlock */ + ret = hwspin_lock_register(bank, &pdev->dev, &rcar_hwspinlock_ops, + 0, RCAR_HWSPINLOCK_NUM); ++ if (ret) ++ pm_runtime_disable(&pdev->dev); + + out: + return ret; +-- +1.9.1 + |