1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c
index 53cb6a3a56ed..068224efa6fa 100644
--- a/drivers/pinctrl/pinctrl-xway.c
+++ b/drivers/pinctrl/pinctrl-xway.c
@@ -9,6 +9,7 @@
  *  Copyright (C) 2012 John Crispin <blogic@openwrt.org>
  */
 
+#include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/of_platform.h>
@@ -719,11 +720,9 @@ static int pinmux_xway_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "Failed to get resource\n");
                 return -ENOENT;
         }
-        xway_info.membase[0] = devm_request_and_ioremap(&pdev->dev, res);
-        if (!xway_info.membase[0]) {
-                dev_err(&pdev->dev, "Failed to remap resource\n");
-                return -ENOMEM;
-        }
+        xway_info.membase[0] = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(xway_info.membase[0]))
+                return PTR_ERR(xway_info.membase[0]);
 
         match = of_match_device(xway_match, &pdev->dev);
         if (match)