---

yaml --- r: 293460 b: refs/heads/master c: fbe4ff7 h: refs/heads/master v: v3
git-mirror · Mar 6, 2012 · ce248a2 · ce248a2
1 parent d6b96be
commit ce248a2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4752a887190ff38175be47aae26a821e8941b96e
+refs/heads/master: fbe4ff795f3c081e2cc21507b804b5ddc78cd362
diff --git a/trunk/sound/soc/codecs/wm8962.c b/trunk/sound/soc/codecs/wm8962.c
@@ -3673,7 +3673,6 @@ static __devinit int wm8962_i2c_probe(struct i2c_client *i2c,
 				ret);
 	}
 
-	pm_runtime_set_active(&i2c->dev);
 	pm_runtime_enable(&i2c->dev);
 	pm_request_idle(&i2c->dev);
-Original file line number
+Diff line change
@@ Expand Up @@
     				ret);
     	}
-    	pm_runtime_set_active(&i2c->dev);
     	pm_runtime_enable(&i2c->dev);
     	pm_request_idle(&i2c->dev);
@@ Expand Down @@