]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
pinctrl: intel: merrifield: Add missed check in mrfld_config_set()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 24 Jan 2017 15:28:22 +0000 (17:28 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 30 Jan 2017 08:15:10 +0000 (09:15 +0100)
Not every pin can be configured. Add missed check to prevent access
violation.

Fixes: 4e80c8f50574 ("pinctrl: intel: Add Intel Merrifield pin controller support")
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/intel/pinctrl-merrifield.c

index b21896126f760a5cbae044ab13cba527e9dbfeff..4d4ef42a39b5faaa1969d20a5aeeedffef90074c 100644 (file)
@@ -794,6 +794,9 @@ static int mrfld_config_set(struct pinctrl_dev *pctldev, unsigned int pin,
        unsigned int i;
        int ret;
 
+       if (!mrfld_buf_available(mp, pin))
+               return -ENOTSUPP;
+
        for (i = 0; i < nconfigs; i++) {
                switch (pinconf_to_config_param(configs[i])) {
                case PIN_CONFIG_BIAS_DISABLE: