---

yaml --- r: 211313 b: refs/heads/master c: 753419f h: refs/heads/master i: 211311: 73729cf v: v3
git-mirror · Sep 30, 2010 · acf8e7e · acf8e7e
1 parent b7ab8d9
commit acf8e7e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -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;
 }