|
Takashi Iwai |
038842 |
From f5181c35ed7ba0ceb6e42872aad1334d994b0175 Mon Sep 17 00:00:00 2001
|
|
Takashi Iwai |
038842 |
From: Yang Yingliang <yangyingliang@huawei.com>
|
|
Takashi Iwai |
038842 |
Date: Tue, 1 Nov 2022 11:41:18 +0800
|
|
Takashi Iwai |
038842 |
Subject: [PATCH] HSI: omap_ssi_core: fix unbalanced pm_runtime_disable()
|
|
Takashi Iwai |
038842 |
Git-commit: f5181c35ed7ba0ceb6e42872aad1334d994b0175
|
|
Takashi Iwai |
038842 |
Patch-mainline: v6.2-rc1
|
|
Takashi Iwai |
038842 |
References: git-fixes
|
|
Takashi Iwai |
038842 |
|
|
Takashi Iwai |
038842 |
In error label 'out1' path in ssi_probe(), the pm_runtime_enable()
|
|
Takashi Iwai |
038842 |
has not been called yet, so pm_runtime_disable() is not needed.
|
|
Takashi Iwai |
038842 |
|
|
Takashi Iwai |
038842 |
Fixes: b209e047bc74 ("HSI: Introduce OMAP SSI driver")
|
|
Takashi Iwai |
038842 |
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
|
|
Takashi Iwai |
038842 |
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
|
|
Takashi Iwai |
038842 |
Acked-by: Takashi Iwai <tiwai@suse.de>
|
|
Takashi Iwai |
038842 |
|
|
Takashi Iwai |
038842 |
---
|
|
Takashi Iwai |
038842 |
drivers/hsi/controllers/omap_ssi_core.c | 2 +-
|
|
Takashi Iwai |
038842 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Takashi Iwai |
038842 |
|
|
Takashi Iwai |
038842 |
diff --git a/drivers/hsi/controllers/omap_ssi_core.c b/drivers/hsi/controllers/omap_ssi_core.c
|
|
Takashi Iwai |
038842 |
index eb9820158318..b23a576ed88a 100644
|
|
Takashi Iwai |
038842 |
--- a/drivers/hsi/controllers/omap_ssi_core.c
|
|
Takashi Iwai |
038842 |
+++ b/drivers/hsi/controllers/omap_ssi_core.c
|
|
Takashi Iwai |
038842 |
@@ -536,9 +536,9 @@ static int ssi_probe(struct platform_device *pd)
|
|
Takashi Iwai |
038842 |
device_for_each_child(&pd->dev, NULL, ssi_remove_ports);
|
|
Takashi Iwai |
038842 |
out2:
|
|
Takashi Iwai |
038842 |
ssi_remove_controller(ssi);
|
|
Takashi Iwai |
038842 |
+ pm_runtime_disable(&pd->dev);
|
|
Takashi Iwai |
038842 |
out1:
|
|
Takashi Iwai |
038842 |
platform_set_drvdata(pd, NULL);
|
|
Takashi Iwai |
038842 |
- pm_runtime_disable(&pd->dev);
|
|
Takashi Iwai |
038842 |
|
|
Takashi Iwai |
038842 |
return err;
|
|
Takashi Iwai |
038842 |
}
|
|
Takashi Iwai |
038842 |
--
|
|
Takashi Iwai |
038842 |
2.35.3
|
|
Takashi Iwai |
038842 |
|