4 files changed, 42 insertions, 18 deletions

diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 3dd2de31a2f8..472b88285c75 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/delay.h>
+#include <linux/dmi.h>
 #include <linux/i2c.h>
 #include <linux/clk.h>
 #include <linux/clk-provider.h>
@@ -51,6 +52,22 @@ static u32 i2c_dw_get_clk_rate_khz(struct dw_i2c_dev *dev)
 }
 
 #ifdef CONFIG_ACPI
+/*
+ * The HCNT/LCNT information coming from ACPI should be the most accurate
+ * for given platform. However, some systems get it wrong. On such systems
+ * we get better results by calculating those based on the input clock.
+ */
+static const struct dmi_system_id dw_i2c_no_acpi_params[] = {
+        {
+                .ident = "Dell Inspiron 7348",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 7348"),
+                },
+        },
+        { }
+};
+
 static void dw_i2c_acpi_params(struct platform_device *pdev, char method[],
                                u16 *hcnt, u16 *lcnt, u32 *sda_hold)
 {
@@ -58,6 +75,9 @@ static void dw_i2c_acpi_params(struct platform_device *pdev, char method[],
         acpi_handle handle = ACPI_HANDLE(&pdev->dev);
         union acpi_object *obj;
 
+        if (dmi_check_system(dw_i2c_no_acpi_params))
+                return;
+
         if (ACPI_FAILURE(acpi_evaluate_object(handle, method, NULL, &buf)))
                 return;
 
@@ -253,12 +273,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 +282,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;
 }
 
diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index d8361dada584..d8b5a8fee1e6 100644
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -690,15 +690,16 @@ static int rcar_i2c_probe(struct platform_device *pdev)
                 return ret;
         }
 
+        pm_runtime_enable(dev);
+        platform_set_drvdata(pdev, priv);
+
         ret = i2c_add_numbered_adapter(adap);
         if (ret < 0) {
                 dev_err(dev, "reg adap failed: %d\n", ret);
+                pm_runtime_disable(dev);
                 return ret;
         }
 
-        pm_runtime_enable(dev);
-        platform_set_drvdata(pdev, priv);
-
         dev_info(dev, "probed\n");
 
         return 0;
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 50bfd8cef5f2..5df819610d52 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -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));
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 5f89f1e3c2f2..a59c3111f7fb 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -694,12 +694,12 @@ static int i2c_device_probe(struct device *dev)
                 goto err_clear_wakeup_irq;
 
         status = dev_pm_domain_attach(&client->dev, true);
-        if (status != -EPROBE_DEFER) {
-                status = driver->probe(client, i2c_match_id(driver->id_table,
-                                        client));
-                if (status)
-                        goto err_detach_pm_domain;
-        }
+        if (status == -EPROBE_DEFER)
+                goto err_clear_wakeup_irq;
+
+        status = driver->probe(client, i2c_match_id(driver->id_table, client));
+        if (status)
+                goto err_detach_pm_domain;
 
         return 0;