summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-09-21 15:19:09 +0800
committerHaojian Zhuang <haojian.zhuang@gmail.com>2012-09-21 15:33:58 +0800
commite09a716490dbce0b9b7d132d191f1f8785cb5df2 (patch)
treefd0e26787db9aa544a1d40d774cbde7f833f63fe /drivers/pcmcia
parent5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff)
downloadblackbird-op-linux-e09a716490dbce0b9b7d132d191f1f8785cb5df2.tar.gz
blackbird-op-linux-e09a716490dbce0b9b7d132d191f1f8785cb5df2.zip
ARM: pxa: fix return value check in pxa2xx_drv_pcmcia_probe()
In case of error, the function clk_get() returns ERR_PTR() and never returns NULL pointer. The NULL test in the error handling should be replaced with IS_ERR(). dpatch engine is used to auto generated this patch. (https://github.com/weiyj/dpatch) Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Acked-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/pxa2xx_base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 490bb82b5bdb..cfec9dd18ff5 100644
--- 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);
OpenPOWER on IntegriCloud