tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'gpio-v5.3-rc7-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into fixes

gpio fixes for v5.3-rc7

- two patches fixing a regression in the pca953x driver

Linus Walleij 89f2c042 a55aa89a

+6 -9
+6 -9
drivers/gpio/gpio-pca953x.c
··· 604 u8 new_irqs; 605 int level, i; 606 u8 invert_irq_mask[MAX_BANK]; 607 - int reg_direction[MAX_BANK]; 608 609 - regmap_bulk_read(chip->regmap, chip->regs->direction, reg_direction, 610 - NBANK(chip)); 611 612 if (chip->driver_data & PCA_PCAL) { 613 /* Enable latch on interrupt-enabled inputs */ ··· 678 bool pending_seen = false; 679 bool trigger_seen = false; 680 u8 trigger[MAX_BANK]; 681 - int reg_direction[MAX_BANK]; 682 int ret, i; 683 684 if (chip->driver_data & PCA_PCAL) { ··· 709 return false; 710 711 /* Remove output pins from the equation */ 712 - regmap_bulk_read(chip->regmap, chip->regs->direction, reg_direction, 713 - NBANK(chip)); 714 for (i = 0; i < NBANK(chip); i++) 715 cur_stat[i] &= reg_direction[i]; 716 ··· 766 { 767 struct i2c_client *client = chip->client; 768 struct irq_chip *irq_chip = &chip->irq_chip; 769 - int reg_direction[MAX_BANK]; 770 int ret, i; 771 772 if (!client->irq) ··· 787 * interrupt. We have to rely on the previous read for 788 * this purpose. 789 */ 790 - regmap_bulk_read(chip->regmap, chip->regs->direction, reg_direction, 791 - NBANK(chip)); 792 for (i = 0; i < NBANK(chip); i++) 793 chip->irq_stat[i] &= reg_direction[i]; 794 mutex_init(&chip->irq_lock);
··· 604 u8 new_irqs; 605 int level, i; 606 u8 invert_irq_mask[MAX_BANK]; 607 + u8 reg_direction[MAX_BANK]; 608 609 + pca953x_read_regs(chip, chip->regs->direction, reg_direction); 610 611 if (chip->driver_data & PCA_PCAL) { 612 /* Enable latch on interrupt-enabled inputs */ ··· 679 bool pending_seen = false; 680 bool trigger_seen = false; 681 u8 trigger[MAX_BANK]; 682 + u8 reg_direction[MAX_BANK]; 683 int ret, i; 684 685 if (chip->driver_data & PCA_PCAL) { ··· 710 return false; 711 712 /* Remove output pins from the equation */ 713 + pca953x_read_regs(chip, chip->regs->direction, reg_direction); 714 for (i = 0; i < NBANK(chip); i++) 715 cur_stat[i] &= reg_direction[i]; 716 ··· 768 { 769 struct i2c_client *client = chip->client; 770 struct irq_chip *irq_chip = &chip->irq_chip; 771 + u8 reg_direction[MAX_BANK]; 772 int ret, i; 773 774 if (!client->irq) ··· 789 * interrupt. We have to rely on the previous read for 790 * this purpose. 791 */ 792 + pca953x_read_regs(chip, chip->regs->direction, reg_direction); 793 for (i = 0; i < NBANK(chip); i++) 794 chip->irq_stat[i] &= reg_direction[i]; 795 mutex_init(&chip->irq_lock);