---

yaml --- r: 319135 b: refs/heads/master c: 2474051 h: refs/heads/master i: 319133: 5b8c2ab 319131: f4d8e39 319127: 54979d4 319119: 5f883d0 319103: 0ed1403 v: v3
git-mirror · Jul 8, 2012 · 974f21e · 974f21e
1 parent fce3835
commit 974f21e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dae3efb123f8b21df57f426c9c72d6ebcd83f8d
+refs/heads/master: 247405160093cf88cb59242f877543dd28e93df1
diff --git a/trunk/drivers/i2c/busses/i2c-omap.c b/trunk/drivers/i2c/busses/i2c-omap.c
@@ -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);