dect
/
linux-2.6
Archived
13
0
Fork 0

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:
Olof Johansson 2012-09-21 23:11:52 -07:00
commit b10731fb56
1 changed files with 1 additions and 1 deletions

View File

@ -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);