summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-01-10 11:05:06 +0000
committerGrant Likely <grant.likely@secretlab.ca>2011-01-10 16:44:01 -0700
commit76d9cc454a8d0bb7484616a4b8136280068c8a8b (patch)
tree21658ce10c4c27c17676fa018c344169af566cf2 /drivers/spi
parente0e736fc0d33861335e2a132e4f688f7fd380c61 (diff)
downloadop-kernel-dev-76d9cc454a8d0bb7484616a4b8136280068c8a8b.zip
op-kernel-dev-76d9cc454a8d0bb7484616a4b8136280068c8a8b.tar.gz
spi: tegra: don't treat NULL clk as an error
Some platforms have been known to return NULL from clk_get() if they support only a single struct clk. Whilst tegra doesn't do this, make the drivers consistent with others. Signed-off-by: Jamie Iles <jamie@jamieiles.com> Acked-by: Russell King <linux@arm.linux.org.uk> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi_tegra.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi_tegra.c b/drivers/spi/spi_tegra.c
index bb7df02..891e590 100644
--- a/drivers/spi/spi_tegra.c
+++ b/drivers/spi/spi_tegra.c
@@ -513,7 +513,7 @@ static int __init spi_tegra_probe(struct platform_device *pdev)
}
tspi->clk = clk_get(&pdev->dev, NULL);
- if (IS_ERR_OR_NULL(tspi->clk)) {
+ if (IS_ERR(tspi->clk)) {
dev_err(&pdev->dev, "can not get clock\n");
ret = PTR_ERR(tspi->clk);
goto err2;
OpenPOWER on IntegriCloud