diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-21 23:11:52 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-21 23:11:52 -0700 |
| commit | b10731fb567e9029113089119b296a012a8310d7 (patch) | |
| tree | 2eedded112c1c6b993052a46a09f3a0268389564 | |
| parent | b536661bb0091b19123fa0c22f7087fd886d7b37 (diff) | |
| parent | e09a716490dbce0b9b7d132d191f1f8785cb5df2 (diff) | |
| download | op-kernel-dev-b10731fb567e9029113089119b296a012a8310d7.zip op-kernel-dev-b10731fb567e9029113089119b296a012a8310d7.tar.gz | |
Merge branch 'pxa/fixes' into next/fixes-non-critical
* pxa/fixes:
ARM: pxa: fix return value check in pxa2xx_drv_pcmcia_probe()
| -rw-r--r-- | drivers/pcmcia/pxa2xx_base.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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); |
