Skip to contentSkip to conversation

i2c: designware: Disable runtime PM in case i2c_dw_probe() fails

PATCH Applied Jarkko Nikula 3 participants 3 messages Oct 21, 2015 – Oct 22, 2015

Subsystems (3)
I2C subsystem host drivers Intel LPSS (Low Power SubSystem) drivers Synopsys DesignWare I2C driver
lore
Share & tools
lore

Jarkko Nikula

author
#0 lore raw

PATCH 1/1 i2c: designware: Disable runtime PM in case i2c_dw_probe() fails

Call to pm_runtime_disable() got dropped while handling the merge conflict between commit 36d48fb5766a ("i2c: designware-platdrv: enable RuntimePM before registering to the core") and commit d80d134182ba ("i2c: designware:
Move common probe code into i2c_dw_probe()").

Signed-off-by Jarkko Nikula <[email protected]>
---
 drivers/i2c/busses/i2c-designware-platdrv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-designware-platdrv.c +3 -1
index eb55760ccd9f..8fd9d4a18bd5 100644
@@ -261,8 +261,10 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
 	}
 
 	r = i2c_dw_probe(dev);
-	if (r)
+	if (r) {
+		pm_runtime_disable(&pdev->dev);
 		return r;
+	}
 
 	return 0;
 }
Signature · 1 line
2.6.1
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Jarkko Nikula

Call to pm_runtime_disable() got dropped while handling the merge conflict between commit 36d48fb5766a ("i2c: designware-platdrv: enable RuntimePM before registering to the core") and commit d80d134182ba ("i2c: designware:
Move common probe code into i2c_dw_probe()").

Signed-off-by Jarkko Nikula <[email protected]>
Acked-by Mika Westerberg <[email protected]>
Applied
#2 lore raw
In reply to Jarkko Nikula
Quoted 6 lines · Jarkko Nikula

Call to pm_runtime_disable() got dropped while handling the merge conflict between commit 36d48fb5766a ("i2c: designware-platdrv: enable RuntimePM before registering to the core") and commit d80d134182ba ("i2c: designware:
Move common probe code into i2c_dw_probe()").

Signed-off-by Jarkko Nikula <[email protected]>

Applied to for-next, thanks!