Merge tag 'mmc-updates-for-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / host / sdhci-s3c.c

diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index b16dae00cfd42887af0ab158f412d3c8bd3f6fd1..7363efe72287482def2cf32f4e4e515788c33d80 100644 (file)
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -651,10 +651,9 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
 #endif
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       host->ioaddr = devm_request_and_ioremap(&pdev->dev, res);
-       if (!host->ioaddr) {
-               dev_err(dev, "failed to map registers\n");
-               ret = -ENXIO;
+       host->ioaddr = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(host->ioaddr)) {
+               ret = PTR_ERR(host->ioaddr);
                goto err_req_regs;
        }