| commit | b10731fb567e9029113089119b296a012a8310d7 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Fri Sep 21 23:11:52 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Fri Sep 21 23:11:52 2012 -0700 |
| tree | 2eedded112c1c6b993052a46a09f3a0268389564 | |
| parent | b536661bb0091b19123fa0c22f7087fd886d7b37 [diff] | |
| parent | e09a716490dbce0b9b7d132d191f1f8785cb5df2 [diff] |
Merge branch 'pxa/fixes' into next/fixes-non-critical * pxa/fixes: ARM: pxa: fix return value check in pxa2xx_drv_pcmcia_probe()
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index 490bb82..cfec9dd 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c
@@ -297,7 +297,7 @@ } clk = clk_get(&dev->dev, NULL); - if (!clk) + if (IS_ERR(clk)) return -ENODEV; pxa2xx_drv_pcmcia_ops(ops);