Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 50c01fc355c6a97c511d58411f9bc0e4b8fc4659

Authored by Jamie Iles
Committed by Grant Likely
1 parent 76d9cc454a
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff

drivers/spi/dw_spi_mmio.c
Diff comments   View file @ 50c01fc
... ... @@ -9,6 +9,7 @@
9 9 */
10 10  
11 11 #include <linux/clk.h>
  12 +#include <linux/err.h>
12 13 #include <linux/interrupt.h>
13 14 #include <linux/platform_device.h>
14 15 #include <linux/slab.h>
... ... @@ -68,8 +69,8 @@
68 69 }
69 70  
70 71 dwsmmio->clk = clk_get(&pdev->dev, NULL);
71   - if (!dwsmmio->clk) {
72   - ret = -ENODEV;
  72 + if (IS_ERR(dwsmmio->clk)) {
  73 + ret = PTR_ERR(dwsmmio->clk);
73 74 goto err_irq;
74 75 }
75 76 clk_enable(dwsmmio->clk);