Commit 90e210c2 authored by Wolfram Sang's avatar Wolfram Sang Committed by Greg Kroah-Hartman

i2c: designware-platdrv: enable RuntimePM before registering to the core

commit 36d48fb5 upstream.

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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 67e6df4b
...@@ -273,12 +273,6 @@ static int dw_i2c_probe(struct platform_device *pdev) ...@@ -273,12 +273,6 @@ static int dw_i2c_probe(struct platform_device *pdev)
adap->dev.parent = &pdev->dev; adap->dev.parent = &pdev->dev;
adap->dev.of_node = pdev->dev.of_node; 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) { if (dev->pm_runtime_disabled) {
pm_runtime_forbid(&pdev->dev); pm_runtime_forbid(&pdev->dev);
} else { } else {
...@@ -288,6 +282,13 @@ static int dw_i2c_probe(struct platform_device *pdev) ...@@ -288,6 +282,13 @@ static int dw_i2c_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev); 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; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment