Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24740516 authored by Shubhrajyoti D's avatar Shubhrajyoti D Committed by Wolfram Sang
Browse files

I2C: OMAP: Fix the mismatch of pm_runtime enable and disable 



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: default avatarKevin Hilman <khilman@ti.com>
Signed-off-by: default avatarShubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
parent 3dae3efb

drivers/i2c/busses/i2c-omap.c

+2 −0
Original line number Diff line number Diff line
@@ -1090,6 +1090,7 @@ omap_i2c_probe(struct platform_device *pdev) 
	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);