diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-23 10:23:09 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-23 10:23:09 +0100 |
| commit | ec84f0056711efe93f034c86dd65e0de8d3531ff (patch) | |
| tree | 3e50d385d645487924bcac1f5fb33b496cda6dc0 /drivers/gpio/gpio-pca953x.c | |
| parent | d03266910a533d874c01ef2ca8dc73009f2925fa (diff) | |
| parent | 23400ac997062647f2b63c82030d189671b1effe (diff) | |
| download | linux-ec84f0056711efe93f034c86dd65e0de8d3531ff.tar.gz linux-ec84f0056711efe93f034c86dd65e0de8d3531ff.tar.bz2 linux-ec84f0056711efe93f034c86dd65e0de8d3531ff.zip | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpio/gpio-pca953x.c')
| -rw-r--r-- | drivers/gpio/gpio-pca953x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index e422568e14ad..fe731f094257 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -372,14 +372,15 @@ static void pca953x_gpio_set_multiple(struct gpio_chip *gc, bank_shift = fls((chip->gpio_chip.ngpio - 1) / BANK_SZ); - memcpy(reg_val, chip->reg_output, NBANK(chip)); mutex_lock(&chip->i2c_lock); + memcpy(reg_val, chip->reg_output, NBANK(chip)); for (bank = 0; bank < NBANK(chip); bank++) { bank_mask = mask[bank / sizeof(*mask)] >> ((bank % sizeof(*mask)) * 8); if (bank_mask) { bank_val = bits[bank / sizeof(*bits)] >> ((bank % sizeof(*bits)) * 8); + bank_val &= bank_mask; reg_val[bank] = (reg_val[bank] & ~bank_mask) | bank_val; } } @@ -607,7 +608,6 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, if (client->irq && irq_base != -1 && (chip->driver_data & PCA_INT)) { - ret = pca953x_read_regs(chip, chip->regs->input, chip->irq_stat); if (ret) |