Merge tag 'mmc-updates-for-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
[~shefty/rdma-dev.git] / drivers / mmc / host / mxs-mmc.c
index 493cd9e..4efe302 100644 (file)
@@ -614,9 +614,9 @@ static int mxs_mmc_probe(struct platform_device *pdev)
        host = mmc_priv(mmc);
        ssp = &host->ssp;
        ssp->dev = &pdev->dev;
        host = mmc_priv(mmc);
        ssp = &host->ssp;
        ssp->dev = &pdev->dev;
-       ssp->base = devm_request_and_ioremap(&pdev->dev, iores);
-       if (!ssp->base) {
-               ret = -EADDRNOTAVAIL;
+       ssp->base = devm_ioremap_resource(&pdev->dev, iores);
+       if (IS_ERR(ssp->base)) {
+               ret = PTR_ERR(ssp->base);
                goto out_mmc_free;
        }
 
                goto out_mmc_free;
        }