Merge branch 'pxa/fixes' into next/fixes-non-critical

* pxa/fixes: ARM: pxa: fix return value check in pxa2xx_drv_pcmcia_probe()
git-mirror · Sep 22, 2012 · b10731f · b10731f
2 parents b536661 + e09a716
commit b10731f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);