diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-05-15 13:48:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-15 13:48:59 -0700 |
| commit | da07f52d3caf6c24c6dbffb5500f379d819e04bd (patch) | |
| tree | 836e51994554f1aeddeebb6cb6ee568944a467e7 /drivers/gpio/gpio-pca953x.c | |
| parent | Merge branch 'mptcp-fix-MP_JOIN-failure-handling' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | wireguard-linux-da07f52d3caf6c24c6dbffb5500f379d819e04bd.tar.xz wireguard-linux-da07f52d3caf6c24c6dbffb5500f379d819e04bd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Move the bpf verifier trace check into the new switch statement in
HEAD.
Resolve the overlapping changes in hinic, where bug fixes overlap
the addition of VF support.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpio/gpio-pca953x.c')
| -rw-r--r-- | drivers/gpio/gpio-pca953x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index 5638b4e5355f..4269ea9a817e 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -531,7 +531,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); |