Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-beck.git] / drivers / spi / spi-mxs.c

diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index e3d8b3197d22be04f0ed9db3f4c131c1e915905a..22a0af0147fb52be3fcb4111efaaafce27b80663 100644 (file)
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -541,9 +541,9 @@ static int mxs_spi_probe(struct platform_device *pdev)
        if (!iores || irq_err < 0 || irq_dma < 0)
                return -EINVAL;
 
-       base = devm_request_and_ioremap(&pdev->dev, iores);
-       if (!base)
-               return -EADDRNOTAVAIL;
+       base = devm_ioremap_resource(&pdev->dev, iores);
+       if (IS_ERR(base))
+               return PTR_ERR(base);
 
        pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
        if (IS_ERR(pinctrl))