From acf8e7e4e31225402b11a901652bf3ee21b458c3 Mon Sep 17 00:00:00 2001
From: Vishwanath BS <vishwanath.bs@ti.com>
Date: Thu, 30 Sep 2010 14:14:22 +0200
Subject: [PATCH] --- yaml --- r: 211313 b: refs/heads/master c:
 753419f59e10d7181e43f0b9cc5beff43ef3f7a4 h: refs/heads/master i:   211311:
 73729cf071bf36ecc2955105d1394801ce8757f9 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/i2c/i2c-core.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index b1806555da16..8e84828fd68f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59bfee6e0682635c269fb271422e2595fa441c21
+refs/heads/master: 753419f59e10d7181e43f0b9cc5beff43ef3f7a4
diff --git a/trunk/drivers/i2c/i2c-core.c b/trunk/drivers/i2c/i2c-core.c
index 6649176de940..13927d54cb4e 100644
--- a/trunk/drivers/i2c/i2c-core.c
+++ b/trunk/drivers/i2c/i2c-core.c
@@ -216,12 +216,6 @@ static int i2c_device_pm_resume(struct device *dev)
 	else
 		ret = i2c_legacy_resume(dev);
 
-	if (!ret) {
-		pm_runtime_disable(dev);
-		pm_runtime_set_active(dev);
-		pm_runtime_enable(dev);
-	}
-
 	return ret;
 }