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

[firefly-linux-kernel-4.4.55.git] / sound / soc / mxs / mxs-saif.c

diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index e70e6c844f96b29ca631e69841aea53b51886d00..3a2aa1d19b936d5a830513cf43ad3175eea82c2c 100644 (file)
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -717,11 +717,9 @@ static int mxs_saif_probe(struct platform_device *pdev)
 
        iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-       saif->base = devm_request_and_ioremap(&pdev->dev, iores);
-       if (!saif->base) {
-               dev_err(&pdev->dev, "ioremap failed\n");
-               return -ENODEV;
-       }
+       saif->base = devm_ioremap_resource(&pdev->dev, iores);
+       if (IS_ERR(saif->base))
+               return PTR_ERR(saif->base);
 
        dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0);
        if (!dmares) {