Commit 50c01fc3 authored by Jamie Iles's avatar Jamie Iles Committed by Grant Likely

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: default avatarJamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 76d9cc45
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
*/ */
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/err.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -68,8 +69,8 @@ static int __devinit dw_spi_mmio_probe(struct platform_device *pdev) ...@@ -68,8 +69,8 @@ static int __devinit dw_spi_mmio_probe(struct platform_device *pdev)
} }
dwsmmio->clk = clk_get(&pdev->dev, NULL); dwsmmio->clk = clk_get(&pdev->dev, NULL);
if (!dwsmmio->clk) { if (IS_ERR(dwsmmio->clk)) {
ret = -ENODEV; ret = PTR_ERR(dwsmmio->clk);
goto err_irq; goto err_irq;
} }
clk_enable(dwsmmio->clk); clk_enable(dwsmmio->clk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment