Commit 4f7effdd authored Oct 09, 2015 by Wolfram Sang Committed by Wolfram Sang Oct 15, 2015

i2c: rcar: enable RuntimePM before registering to the core



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>
Cc: stable@kernel.org

parent 74cedd30

drivers/i2c/busses/i2c-rcar.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -690,15 +690,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;