Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[~andy/linux] / drivers / dma / mmp_tdma.c

diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c
index a9f1cd56689c06a1995aaca6ee53717ecc28a5e0..43d5a6c3329772e6680a908b2bfea2994c4fa9b0 100644 (file)
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@ -9,6 +9,7 @@
  *
  */
 
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/types.h>
@@ -547,9 +548,9 @@ static int mmp_tdma_probe(struct platform_device *pdev)
        if (!iores)
                return -EINVAL;
 
-       tdev->base = devm_request_and_ioremap(&pdev->dev, iores);
-       if (!tdev->base)
-               return -EADDRNOTAVAIL;
+       tdev->base = devm_ioremap_resource(&pdev->dev, iores);
+       if (IS_ERR(tdev->base))
+               return PTR_ERR(tdev->base);
 
        INIT_LIST_HEAD(&tdev->device.channels);