]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
I2C: OMAP: Fix the mismatch of pm_runtime enable and disable
authorShubhrajyoti D <shubhrajyoti@ti.com>
Tue, 29 May 2012 10:56:14 +0000 (16:26 +0530)
committerWolfram Sang <w.sang@pengutronix.de>
Sun, 8 Jul 2012 10:49:13 +0000 (12:49 +0200)
Currently the i2c driver calls the pm_runtime_enable and never
the disable. This may cause a warning when pm_runtime_enable
checks for the count match.Fix the same by calling
pm_runtime_disable in the error and the remove path.

Cc: Rajendra Nayak <rnayak@ti.com>
Acked-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
drivers/i2c/busses/i2c-omap.c

index 4f4188de325102ef060e839101240c5d4e7320ab..c851672eb6a85e4711198fcae2f421ba32741c67 100644 (file)
@@ -1090,6 +1090,7 @@ err_unuse_clocks:
        omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
        pm_runtime_put(dev->dev);
        iounmap(dev->base);
+       pm_runtime_disable(&pdev->dev);
 err_free_mem:
        platform_set_drvdata(pdev, NULL);
        kfree(dev);
@@ -1110,6 +1111,7 @@ omap_i2c_remove(struct platform_device *pdev)
        free_irq(dev->irq, dev);
        i2c_del_adapter(&dev->adapter);
        omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
+       pm_runtime_disable(&pdev->dev);
        iounmap(dev->base);
        kfree(dev);
        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);