staging: omap-thermal: document omap_bandgap_tshut_init function

[~andy/linux] / drivers / pinctrl / pinctrl-bcm2835.c

diff --git a/drivers/pinctrl/pinctrl-bcm2835.c b/drivers/pinctrl/pinctrl-bcm2835.c
index d347b9f2eae305f810b4232cd16f274ac4231ada..4eb6d2c4e4df80c3222415ff7463b4db67b730ab 100644 (file)
--- a/drivers/pinctrl/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/pinctrl-bcm2835.c
@@ -959,9 +959,9 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)
                return err;
        }
 
-       pc->base = devm_request_and_ioremap(dev, &iomem);
-       if (!pc->base)
-               return -EADDRNOTAVAIL;
+       pc->base = devm_ioremap_resource(dev, &iomem);
+       if (IS_ERR(pc->base))
+               return PTR_ERR(pc->base);
 
        pc->gpio_chip = bcm2835_gpio_chip;
        pc->gpio_chip.dev = dev;