Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eadd709f authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang
Browse files

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: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: default avatarKukjin Kim <kgene@kernel.org>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org
parent 4f7effdd

drivers/i2c/busses/i2c-s3c2410.c

+5 −3
Original line number Diff line number Diff line
@@ -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));