From 52ac9e6cc07791f557f4f8e087f62bf7d1cf34d9 Mon Sep 17 00:00:00 2001 From: Prashant Gaikwad Date: Fri, 11 Jan 2013 13:31:20 +0530 Subject: [PATCH] --- yaml --- r: 355547 b: refs/heads/master c: 3cb919022a7ab7628fcd69c28d475d2dbb1cb150 h: refs/heads/master i: 355545: eaa9118d9ae6d457136ee662441396a88ae6d438 355543: aac0ca4894232673157e144270f5de1df240078a v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi-tegra20-sflash.c | 2 +- trunk/drivers/spi/spi-tegra20-slink.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 804932547e7a..b72913a0faf4 100644 --- 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 index 02feaa51a0fa..e5dce91b74ca 100644 --- 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 index fa208a5cc612..e255e7a35678 100644 --- 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);