| Message ID | 1445437306-9268-1-git-send-email-jarkko.nikula@linux.intel.com |
|---|---|
| State | Accepted |
| Headers | show |
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> -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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!
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; }
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(-)