diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:26:03 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:26:03 +0800 |
| commit | 8fa6d2e1fe937af9dbacb5aad8c43dbb67466fa0 (patch) | |
| tree | 53b1cbcaec14e50f491e1cb1f20106c7a15c70e8 /drivers/i2c/busses/i2c-rcar.c | |
| parent | 74bc3fe5f5fbb50d63fd002ce240cc7bca236db1 (diff) | |
| parent | f90ae1b62bedd8b57966a7be68855f2d43170db6 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-16.01-android
Diffstat (limited to 'drivers/i2c/busses/i2c-rcar.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-rcar.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c index d826e82dd997..47bd421f2750 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c @@ -584,15 +584,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; |