From 6f90fde4f683ebed4b6d4dcb4844bfa78e411c9b Mon Sep 17 00:00:00 2001 From: Jarkko Nikula Date: Wed, 21 Oct 2015 17:21:46 +0300 Subject: [PATCH] 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 Acked-by: Mika Westerberg Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-designware-platdrv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index f6b252a8ffd1..de835b8e847a 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -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; } -- 2.39.2