Home Home > GIT Browse
diff options
authorWolfram Sang <wsa+renesas@sang-engineering.com>2015-10-09 10:39:25 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-27 09:44:50 +0900
commit49d851cea0996812449cbe2ceb886cbbf413085a (patch)
parent2aafe811b0d734f1dc743ce23bc9bec94dec26cb (diff)
i2c: rcar: enable RuntimePM before registering to the core
commit 4f7effddf4549d57114289f273710f077c4c330a upstream. The core may register clients attached to this master which may use funtionality from the master. So, RuntimePM must be enabled before, otherwise this will fail. While here, move drvdata, too. Reported-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index 8a806f5c40cf..3f2dbd1ce6a3 100644
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -673,15 +673,16 @@ static int rcar_i2c_probe(struct platform_device *pdev)
return ret;
+ pm_runtime_enable(dev);
+ platform_set_drvdata(pdev, priv);
ret = i2c_add_numbered_adapter(adap);
if (ret < 0) {
dev_err(dev, "reg adap failed: %d\n", ret);
+ pm_runtime_disable(dev);
return ret;
- pm_runtime_enable(dev);
- platform_set_drvdata(pdev, priv);
dev_info(dev, "probed\n");
return 0;