* [PATCH] i2c: designware: Disable runtime PM in case i2c_dw_probe() fails
@ 2015-10-21 14:21 Jarkko Nikula
2015-10-22 7:41 ` Mika Westerberg
2015-10-22 12:36 ` Wolfram Sang
0 siblings, 2 replies; 3+ messages in thread
From: Jarkko Nikula @ 2015-10-21 14:21 UTC (permalink / raw)
To: linux-i2c; +Cc: Wolfram Sang, Andy Shevchenko, Mika Westerberg, 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 <jarkko.nikula@linux.intel.com>
---
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 eb55760ccd9f..8fd9d4a18bd5 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.6.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] i2c: designware: Disable runtime PM in case i2c_dw_probe() fails
2015-10-21 14:21 [PATCH] i2c: designware: Disable runtime PM in case i2c_dw_probe() fails Jarkko Nikula
@ 2015-10-22 7:41 ` Mika Westerberg
2015-10-22 12:36 ` Wolfram Sang
1 sibling, 0 replies; 3+ messages in thread
From: Mika Westerberg @ 2015-10-22 7:41 UTC (permalink / raw)
To: Jarkko Nikula; +Cc: linux-i2c, Wolfram Sang, Andy Shevchenko
On Wed, Oct 21, 2015 at 05:21:46PM +0300, Jarkko Nikula wrote:
> 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 <jarkko.nikula@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] i2c: designware: Disable runtime PM in case i2c_dw_probe() fails
2015-10-21 14:21 [PATCH] i2c: designware: Disable runtime PM in case i2c_dw_probe() fails Jarkko Nikula
2015-10-22 7:41 ` Mika Westerberg
@ 2015-10-22 12:36 ` Wolfram Sang
1 sibling, 0 replies; 3+ messages in thread
From: Wolfram Sang @ 2015-10-22 12:36 UTC (permalink / raw)
To: Jarkko Nikula; +Cc: linux-i2c, Andy Shevchenko, Mika Westerberg
[-- Attachment #1: Type: text/plain, Size: 447 bytes --]
On Wed, Oct 21, 2015 at 05:21:46PM +0300, Jarkko Nikula wrote:
> 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 <jarkko.nikula@linux.intel.com>
Applied to for-next, thanks!
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-22 12:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-21 14:21 [PATCH] i2c: designware: Disable runtime PM in case i2c_dw_probe() fails Jarkko Nikula
2015-10-22 7:41 ` Mika Westerberg
2015-10-22 12:36 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).