diff options
| author |   Wolfram Sang <wsa+renesas@sang-engineering.com> | 2015-10-10 08:24:23 +0100 |
|---|---|---|
| committer |   Wolfram Sang <wsa@the-dreams.de> | 2015-10-15 14:26:07 +0200 |
| commit | eadd709f5d2e8aebb1b7bf49460e97a68d81a9b0 (patch) | |
| tree | da60579629b0bb02a31cb688d93070d0d1c7e9ab /drivers/i2c/busses/i2c-s3c2410.c | |
| parent | i2c: rcar: enable RuntimePM before registering to the core (diff) | |
| download | linux-dev-eadd709f5d2e8aebb1b7bf49460e97a68d81a9b0.tar.xz linux-dev-eadd709f5d2e8aebb1b7bf49460e97a68d81a9b0.zip | |
i2c: s3c2410: 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.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Kukjin Kim <kgene@kernel.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org
Diffstat (limited to '')
| -rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 50bfd8cef5f2..5df819610d52 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -1243,17 +1243,19 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) i2c->adap.nr = i2c->pdata->bus_num; i2c->adap.dev.of_node = pdev->dev.of_node; + platform_set_drvdata(pdev, i2c); + + pm_runtime_enable(&pdev->dev); + ret = i2c_add_numbered_adapter(&i2c->adap); if (ret < 0) { dev_err(&pdev->dev, "failed to add bus to i2c core\n"); + pm_runtime_disable(&pdev->dev); s3c24xx_i2c_deregister_cpufreq(i2c); clk_unprepare(i2c->clk); return ret; } - platform_set_drvdata(pdev, i2c); - - pm_runtime_enable(&pdev->dev); pm_runtime_enable(&i2c->adap.dev); dev_info(&pdev->dev, "%s: S3C I2C adapter\n", dev_name(&i2c->adap.dev)); |