Merge tag 'pm+acpi-fixes-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / drivers / pinctrl / pinctrl-u300.c

diff --git a/drivers/pinctrl/pinctrl-u300.c b/drivers/pinctrl/pinctrl-u300.c
index 46a152d1735500fcb22320301fddd00d20f66c52..209a01b8bd3b84d9cbe2071a8007ef1caf7b3f0f 100644 (file)
--- a/drivers/pinctrl/pinctrl-u300.c
+++ b/drivers/pinctrl/pinctrl-u300.c
@@ -1027,21 +1027,23 @@ static int u300_pin_config_get(struct pinctrl_dev *pctldev, unsigned pin,
 }
 
 static int u300_pin_config_set(struct pinctrl_dev *pctldev, unsigned pin,
-                              unsigned long config)
+                              unsigned long *configs, unsigned num_configs)
 {
        struct pinctrl_gpio_range *range =
                pinctrl_find_gpio_range_from_pin(pctldev, pin);
-       int ret;
+       int ret, i;
 
        if (!range)
                return -EINVAL;
 
-       /* Note: none of these configurations take any argument */
-       ret = u300_gpio_config_set(range->gc,
-                                  (pin - range->pin_base + range->base),
-                                  pinconf_to_config_param(config));
-       if (ret)
-               return ret;
+       for (i = 0; i < num_configs; i++) {
+               /* Note: none of these configurations take any argument */
+               ret = u300_gpio_config_set(range->gc,
+                       (pin - range->pin_base + range->base),
+                       pinconf_to_config_param(configs[i]));
+               if (ret)
+                       return ret;
+       } /* for each config */
 
        return 0;
 }
@@ -1075,9 +1077,6 @@ static int u300_pmx_probe(struct platform_device *pdev)
        upmx->dev = &pdev->dev;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res)
-               return -ENOENT;
-
        upmx->virtbase = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(upmx->virtbase))
                return PTR_ERR(upmx->virtbase);