diff options
| author | Jamie Iles <jamie@jamieiles.com> | 2011-01-11 12:43:52 +0000 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-01-11 08:20:07 -0700 |
| commit | 50c01fc355c6a97c511d58411f9bc0e4b8fc4659 (patch) | |
| tree | 95012cb772c16754d9a9db01c428618d2696055e /drivers/spi | |
| parent | 76d9cc454a8d0bb7484616a4b8136280068c8a8b (diff) | |
| download | kernel_samsung_smdk4412-50c01fc355c6a97c511d58411f9bc0e4b8fc4659.zip kernel_samsung_smdk4412-50c01fc355c6a97c511d58411f9bc0e4b8fc4659.tar.gz kernel_samsung_smdk4412-50c01fc355c6a97c511d58411f9bc0e4b8fc4659.tar.bz2 | |
spi/dw_spi: don't treat NULL clk as an error
clk_get() returns a struct clk cookie to the driver and some platforms
may return NULL if they only support a single clock. clk_get() has only
failed if it returns a ERR_PTR() encoded pointer.
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/dw_spi_mmio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/spi/dw_spi_mmio.c b/drivers/spi/dw_spi_mmio.c index db35bd9..2fa012c 100644 --- a/drivers/spi/dw_spi_mmio.c +++ b/drivers/spi/dw_spi_mmio.c @@ -9,6 +9,7 @@ */ #include <linux/clk.h> +#include <linux/err.h> #include <linux/interrupt.h> #include <linux/platform_device.h> #include <linux/slab.h> @@ -68,8 +69,8 @@ static int __devinit dw_spi_mmio_probe(struct platform_device *pdev) } dwsmmio->clk = clk_get(&pdev->dev, NULL); - if (!dwsmmio->clk) { - ret = -ENODEV; + if (IS_ERR(dwsmmio->clk)) { + ret = PTR_ERR(dwsmmio->clk); goto err_irq; } clk_enable(dwsmmio->clk); |