Merge tag 'v4.12-rc7' into devel

Linux 4.12-rc7
This commit is contained in:
Linus Walleij
2017-06-29 14:27:39 +02:00
1261 changed files with 14148 additions and 8185 deletions

View File

@@ -831,7 +831,7 @@ static int stm32_pconf_parse_conf(struct pinctrl_dev *pctldev,
break;
case PIN_CONFIG_OUTPUT:
__stm32_gpio_set(bank, offset, arg);
ret = stm32_pmx_gpio_set_direction(pctldev, NULL, pin, false);
ret = stm32_pmx_gpio_set_direction(pctldev, range, pin, false);
break;
default:
ret = -EINVAL;