Merge branch 'pxa/fixes' into next/fixes-non-critical
* pxa/fixes: ARM: pxa: fix return value check in pxa2xx_drv_pcmcia_probe()
This commit is contained in:
commit
b10731fb56
|
@ -297,7 +297,7 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)
|
||||||
}
|
}
|
||||||
|
|
||||||
clk = clk_get(&dev->dev, NULL);
|
clk = clk_get(&dev->dev, NULL);
|
||||||
if (!clk)
|
if (IS_ERR(clk))
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
pxa2xx_drv_pcmcia_ops(ops);
|
pxa2xx_drv_pcmcia_ops(ops);
|
||||||
|
|
Loading…
Reference in New Issue