From bcd8c6ede83e8da6d3055a7fb844066b2ef5f49a Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Wed, 15 Jul 2009 10:42:09 -0700 Subject: [PATCH] --- yaml --- r: 157579 b: refs/heads/master c: 3e46a447396df99e2367fe1564651abaacc19c13 h: refs/heads/master i: 157577: eff5bc3be6f1386128afa6e43bb91a1895287431 157575: ee108165a34c199844b1698b831360b838ece9d9 v: v3 --- [refs] | 2 +- trunk/sound/soc/davinci/davinci-i2s.c | 2 +- trunk/sound/soc/davinci/davinci-mcasp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b0d33573810a..1a2d7f7d8984 100644 --- 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 index f7330e112be5..e5cd97b74c50 100644 --- 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 index b27aab60ece3..f0c034771062 100644 --- 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;