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

Commit 36d48fb5 authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang
Browse files

i2c: designware-platdrv: 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.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Cc: stable@kernel.org
parent eadd709f

drivers/i2c/busses/i2c-designware-platdrv.c

+7 −6
Original line number Diff line number Diff line
@@ -253,12 +253,6 @@ static int dw_i2c_probe(struct platform_device *pdev) 
	adap->dev.parent = &pdev->dev;

	adap->dev.of_node = pdev->dev.of_node;



	r = i2c_add_numbered_adapter(adap);

	if (r) {

		dev_err(&pdev->dev, "failure adding adapter\n");

		return r;

	}



	if (dev->pm_runtime_disabled) {

		pm_runtime_forbid(&pdev->dev);

	} else {
@@ -268,6 +262,13 @@ static int dw_i2c_probe(struct platform_device *pdev) 
		pm_runtime_enable(&pdev->dev);

	}



	r = i2c_add_numbered_adapter(adap);

	if (r) {

		dev_err(&pdev->dev, "failure adding adapter\n");

		pm_runtime_disable(&pdev->dev);

		return r;

	}



	return 0;

}