Commit b10731fb authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'pxa/fixes' into next/fixes-non-critical 

* pxa/fixes:
  ARM: pxa: fix return value check in pxa2xx_drv_pcmcia_probe()
parents b536661b e09a7164

drivers/pcmcia/pxa2xx_base.c

+1 −1
Original line number Diff line number Diff line
@@ -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);