Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs...

[~andy/linux] / drivers / pcmcia / pxa2xx_base.c

diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 490bb82b5bdbd0be8394590f0c7c65b85088f238..cfec9dd18ff5463813d3238aeba9873f164b4703 100644 (file)
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -297,7 +297,7 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)
        }
 
        clk = clk_get(&dev->dev, NULL);
-       if (!clk)
+       if (IS_ERR(clk))
                return -ENODEV;
 
        pxa2xx_drv_pcmcia_ops(ops);