Skip to content

Commit 3ff012f

Browse files
Wolfram Sanggregkh
Wolfram Sang
authored andcommitted
i2c: designware-platdrv: enable RuntimePM before registering to the core
commit 36d48fb 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: Wolfram Sang <[email protected]> Signed-off-by: Wolfram Sang <[email protected]> Acked-by: Mika Westerberg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 1d9efb2 commit 3ff012f

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -273,12 +273,6 @@ static int dw_i2c_probe(struct platform_device *pdev)
273273
adap->dev.parent = &pdev->dev;
274274
adap->dev.of_node = pdev->dev.of_node;
275275

276-
r = i2c_add_numbered_adapter(adap);
277-
if (r) {
278-
dev_err(&pdev->dev, "failure adding adapter\n");
279-
return r;
280-
}
281-
282276
if (dev->pm_runtime_disabled) {
283277
pm_runtime_forbid(&pdev->dev);
284278
} else {
@@ -288,6 +282,13 @@ static int dw_i2c_probe(struct platform_device *pdev)
288282
pm_runtime_enable(&pdev->dev);
289283
}
290284

285+
r = i2c_add_numbered_adapter(adap);
286+
if (r) {
287+
dev_err(&pdev->dev, "failure adding adapter\n");
288+
pm_runtime_disable(&pdev->dev);
289+
return r;
290+
}
291+
291292
return 0;
292293
}
293294

0 commit comments

Comments
 (0)