Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

[~andy/linux] / arch / mips / lantiq / xway / dma.c

diff --git a/arch/mips/lantiq/xway/dma.c b/arch/mips/lantiq/xway/dma.c
index e44a1866653f10fa258df13b3656aa20750002f0..08f7ebd9c7746c5643c9335a4e25d3a19603146f 100644 (file)
--- a/arch/mips/lantiq/xway/dma.c
+++ b/arch/mips/lantiq/xway/dma.c
@@ -21,6 +21,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/module.h>
 #include <linux/clk.h>
+#include <linux/err.h>
 
 #include <lantiq_soc.h>
 #include <xway_dma.h>
@@ -223,8 +224,8 @@ ltq_dma_init(struct platform_device *pdev)
                panic("Failed to get dma resource");
 
        /* remap dma register range */
-       ltq_dma_membase = devm_request_and_ioremap(&pdev->dev, res);
-       if (!ltq_dma_membase)
+       ltq_dma_membase = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(ltq_dma_membase))
                panic("Failed to remap dma resource");
 
        /* power up and reset the dma engine */