diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2020-01-04 00:13:24 +0100 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2020-01-04 00:13:24 +0100 |
commit | 8bee8084ba03d59004103502c3002bb5c05a129f (patch) | |
tree | e2c4ff171ea9c6826a8b90c1cfc1aa5bd35fdf02 | |
parent | fd6988496e79a6a4bdb514a4655d2920209eb85d (diff) | |
parent | ee8598ae527ea0408e440c073e0945fc37488fe6 (diff) | |
download | talos-op-linux-8bee8084ba03d59004103502c3002bb5c05a129f.tar.gz talos-op-linux-8bee8084ba03d59004103502c3002bb5c05a129f.zip |
Merge tag 'gpio-fixes-for-v5.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into fixes
gpio fixes for v5.5-rc5
- fix coding style issues introduced in gpio-mockup during merge window
-rw-r--r-- | drivers/gpio/gpio-mockup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c index c4fdc192ea4e..94b8d3ae27bc 100644 --- a/drivers/gpio/gpio-mockup.c +++ b/drivers/gpio/gpio-mockup.c @@ -156,7 +156,7 @@ static int gpio_mockup_apply_pull(struct gpio_mockup_chip *chip, mutex_lock(&chip->lock); if (test_bit(FLAG_REQUESTED, &desc->flags) && - !test_bit(FLAG_IS_OUT, &desc->flags)) { + !test_bit(FLAG_IS_OUT, &desc->flags)) { curr = __gpio_mockup_get(chip, offset); if (curr == value) goto out; @@ -165,7 +165,7 @@ static int gpio_mockup_apply_pull(struct gpio_mockup_chip *chip, irq_type = irq_get_trigger_type(irq); if ((value == 1 && (irq_type & IRQ_TYPE_EDGE_RISING)) || - (value == 0 && (irq_type & IRQ_TYPE_EDGE_FALLING))) + (value == 0 && (irq_type & IRQ_TYPE_EDGE_FALLING))) irq_sim_fire(sim, offset); } |