|
@@ -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;
|
|
|
}
|
|
|
|