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

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

diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
index 6a5626d146b77f289f4be319a67d5d60bd0ede5c..f59d4177b419975378fbe00498c3e2680c3dbb47 100644 (file)
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@ -534,10 +534,9 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
                }
        }
 
-       sspi->base = devm_request_and_ioremap(&pdev->dev, mem_res);
-       if (!sspi->base) {
-               dev_err(&pdev->dev, "IO remap failed!\n");
-               ret = -ENOMEM;
+       sspi->base = devm_ioremap_resource(&pdev->dev, mem_res);
+       if (IS_ERR(sspi->base)) {
+               ret = PTR_ERR(sspi->base);
                goto free_master;
        }