---

yaml --- r: 355547 b: refs/heads/master c: 3cb9190 h: refs/heads/master i: 355545: eaa9118 355543: aac0ca4 v: v3
git-mirror · Jan 28, 2013 · 52ac9e6 · 52ac9e6
1 parent d81b60b
commit 52ac9e6
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: 52dec4c9eacc339dbf1b2ab549248df1cc6eb030
+refs/heads/master: 3cb919022a7ab7628fcd69c28d475d2dbb1cb150
diff --git a/trunk/drivers/spi/spi-tegra20-sflash.c b/trunk/drivers/spi/spi-tegra20-sflash.c
@@ -525,7 +525,7 @@ static int tegra_sflash_probe(struct platform_device *pdev)
 		goto exit_free_master;
 	}
 
-	tsd->clk = devm_clk_get(&pdev->dev, "spi");
+	tsd->clk = devm_clk_get(&pdev->dev, NULL);
 	if (IS_ERR(tsd->clk)) {
 		dev_err(&pdev->dev, "can not get clock\n");
 		ret = PTR_ERR(tsd->clk);

diff --git a/trunk/drivers/spi/spi-tegra20-slink.c b/trunk/drivers/spi/spi-tegra20-slink.c
@@ -1191,7 +1191,7 @@ static int tegra_slink_probe(struct platform_device *pdev)
 		goto exit_free_master;
 	}
 
-	tspi->clk = devm_clk_get(&pdev->dev, "slink");
+	tspi->clk = devm_clk_get(&pdev->dev, NULL);
 	if (IS_ERR(tspi->clk)) {
 		dev_err(&pdev->dev, "can not get clock\n");
 		ret = PTR_ERR(tspi->clk);