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

[karo-tx-linux.git] / drivers / pinctrl / pinctrl-nomadik.c

diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index de9e8519b803570e4188bb58d5b0c77cf6ab004f..3c80dd98304bc6ce08a021b60d664cc9641b05c9 100644 (file)
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -1362,9 +1362,9 @@ static int nmk_gpio_probe(struct platform_device *dev)
        if (secondary_irq >= 0 && !pdata->get_secondary_status)
                return -EINVAL;
 
-       base = devm_request_and_ioremap(&dev->dev, res);
-       if (!base)
-               return -ENOMEM;
+       base = devm_ioremap_resource(&dev->dev, res);
+       if (IS_ERR(base))
+               return PTR_ERR(base);
 
        clk = devm_clk_get(&dev->dev, NULL);
        if (IS_ERR(clk))