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

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