Merge tag 'v5.7-rc7' into devel

Linux 5.7-rc7
This commit is contained in:
Linus Walleij
2020-05-27 16:15:52 +02:00
1633 changed files with 17399 additions and 9121 deletions

View File

@@ -542,7 +542,7 @@ static int pca953x_gpio_set_config(struct gpio_chip *gc, unsigned int offset,
{
struct pca953x_chip *chip = gpiochip_get_data(gc);
switch (config) {
switch (pinconf_to_config_param(config)) {
case PIN_CONFIG_BIAS_PULL_UP:
case PIN_CONFIG_BIAS_PULL_DOWN:
return pca953x_gpio_set_pull_up_down(chip, offset, config);