diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/1570-4-1-0-kernel-s-drivers-I2C-directory.patch')
-rw-r--r-- | common/recipes-kernel/linux/files/1570-4-1-0-kernel-s-drivers-I2C-directory.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/common/recipes-kernel/linux/files/1570-4-1-0-kernel-s-drivers-I2C-directory.patch b/common/recipes-kernel/linux/files/1570-4-1-0-kernel-s-drivers-I2C-directory.patch index cf83439f..12b131ee 100644 --- a/common/recipes-kernel/linux/files/1570-4-1-0-kernel-s-drivers-I2C-directory.patch +++ b/common/recipes-kernel/linux/files/1570-4-1-0-kernel-s-drivers-I2C-directory.patch @@ -197,33 +197,6 @@ index 3f7d487..0a80e4a 100644 if (ACPI_FAILURE(acpi_evaluate_object(handle, method, NULL, &buf))) return; -@@ -273,6 +253,12 @@ 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 { -@@ -282,13 +268,6 @@ 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-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index 5801227..30059c1 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c |