Skip to content

Commit

Permalink
i2c: rcar: enable RuntimePM before registering to the core
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Wolfram Sang authored and Wolfram Sang committed Oct 15, 2015
1 parent 74cedd3 commit 4f7effd
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/i2c/busses/i2c-rcar.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 4f7effd

Please sign in to comment.