---

yaml --- r: 316204 b: refs/heads/master c: 695594f h: refs/heads/master v: v3
git-mirror · Jun 4, 2012 · 43945fa · 43945fa
1 parent 757294f
commit 43945fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f59fef441753cdd07ffe7268b0801ec48cac7b1d
+refs/heads/master: 695594f1b79d3b88e99e28f06afaab32c4d65853
diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c
@@ -2902,7 +2902,7 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
 		}
 		break;
 	case snd_soc_dapm_clock_supply:
-		w->clk = clk_get(dapm->dev, w->name);
+		w->clk = devm_clk_get(dapm->dev, w->name);
 		if (IS_ERR(w->clk)) {
 			ret = PTR_ERR(w->clk);
 			dev_err(dapm->dev, "Failed to request %s: %d\n",