---

yaml --- r: 157579 b: refs/heads/master c: 3e46a44 h: refs/heads/master i: 157577: eff5bc3 157575: ee10816 v: v3
git-mirror · Jul 16, 2009 · bcd8c6e · bcd8c6e
1 parent cda03db
commit bcd8c6e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9db9ed977d4f1a317f5f4d467d43025fa27223d8
+refs/heads/master: 3e46a447396df99e2367fe1564651abaacc19c13
diff --git a/trunk/sound/soc/davinci/davinci-i2s.c b/trunk/sound/soc/davinci/davinci-i2s.c
@@ -528,7 +528,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
 		goto err_release_region;
 	}
 
-	dev->clk = clk_get(&pdev->dev, pdata->clk_name);
+	dev->clk = clk_get(&pdev->dev, NULL);
 	if (IS_ERR(dev->clk)) {
 		ret = -ENODEV;
 		goto err_free_mem;

diff --git a/trunk/sound/soc/davinci/davinci-mcasp.c b/trunk/sound/soc/davinci/davinci-mcasp.c
@@ -764,7 +764,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
 	}
 
 	pdata = pdev->dev.platform_data;
-	dev->clk = clk_get(&pdev->dev, pdata->clk_name);
+	dev->clk = clk_get(&pdev->dev, NULL);
 	if (IS_ERR(dev->clk)) {
 		ret = -ENODEV;
 		goto err_release_region;