mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-26 20:38:12 +00:00
Code Issues Releases Wiki Activity

gpio fixes for v5.3-rc7

Browse source 
- two patches fixing a regression in the pca953x driver
 -----BEGIN PGP SIGNATURE-----
 
 iQIxBAABCAAdFiEEFp3rbAvDxGAT0sefEacuoBRx13IFAl1o1kYACgkQEacuoBRx
 13Iyng/veISNldGEnLRalWG4bZWVamCdwMpd/x3Xa/TJkfjkae2hA2616ybjcy/P
 5LztWRVTuwBDBUtUnhsPFtWoJ4LFEhPPgSgr6ZkcbObVB+4ppt8JqAWt8nDKVakJ
 Yjl5nhXKvaE9bPWZAGXWxng+4kvomyF36XC26Tf7bP3zzYVZnmSIoWeVjG9iQBsm
 7vTrpC0ptjL0WzJPHKlb77qOYJgugMF8oG3CckAqcIrUHT2wFL3pOEmECik0eyEH
 DTde5H+J+Srb1HSSb3E8QInjCPfSEcBN0DndaB5sKuWIcYg3vYqKaho+5Gjpudoa
 bcxF7uDLg84Pg+0ksnLUl1AhCqyAzfj57+OIogOOqe4Yq2Ma431K1te19Ijh6fZ8
 XQDtvNsWsld3lZM9SAq+Mhq5J3fQUG09FvxDDMN//g0yK9Mf4HmmMej+uczD1a/g
 0ppaijslVdFOhOMamyiNirasKVmPkJ45kKta0xTaf/1g2MQFNhmOmQxByYHDvBwt
 VK8gli8q3FjM/69QIIQ7WNqlkQubClPs2r4ROv269Nog5eBK1ckA0lGnkC0TjXCC
 stiZAw/lBl0QzhGax7cM7zJbw9yozkaMb4BlEA6mBD56YSBdOB80o5cLI1p69f/S
 wSUdQLj7YXxPrDkIjGnFeavEXgOdR5Pp6BIg315yFrinMnLf
 =EARz
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Walleij 2019-08-30 15:28:04 +02:00
commit 89f2c0425c
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/gpio/gpio-pca953x.c
View file

@ -604,10 +604,9 @@ static void pca953x_irq_bus_sync_unlock(struct irq_data *d)
u8 new_irqs;
int level, i;
u8 invert_irq_mask[MAX_BANK];
int reg_direction[MAX_BANK];
u8 reg_direction[MAX_BANK];
regmap_bulk_read(chip->regmap, chip->regs->direction, reg_direction,
NBANK(chip));
pca953x_read_regs(chip, chip->regs->direction, reg_direction);
if (chip->driver_data & PCA_PCAL) {
/* Enable latch on interrupt-enabled inputs */
@ -679,7 +678,7 @@ static bool pca953x_irq_pending(struct pca953x_chip *chip, u8 *pending)
bool pending_seen = false;
bool trigger_seen = false;
u8 trigger[MAX_BANK];
int reg_direction[MAX_BANK];
u8 reg_direction[MAX_BANK];
int ret, i;
if (chip->driver_data & PCA_PCAL) {
@ -710,8 +709,7 @@ static bool pca953x_irq_pending(struct pca953x_chip *chip, u8 *pending)
return false;
/* Remove output pins from the equation */
regmap_bulk_read(chip->regmap, chip->regs->direction, reg_direction,
NBANK(chip));
pca953x_read_regs(chip, chip->regs->direction, reg_direction);
for (i = 0; i < NBANK(chip); i++)
cur_stat[i] &= reg_direction[i];
@ -768,7 +766,7 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
{
struct i2c_client *client = chip->client;
struct irq_chip *irq_chip = &chip->irq_chip;
int reg_direction[MAX_BANK];
u8 reg_direction[MAX_BANK];
int ret, i;
if (!client->irq)
@ -789,8 +787,7 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
* interrupt. We have to rely on the previous read for
* this purpose.
*/
regmap_bulk_read(chip->regmap, chip->regs->direction, reg_direction,
NBANK(chip));
pca953x_read_regs(chip, chip->regs->direction, reg_direction);
for (i = 0; i < NBANK(chip); i++)
chip->irq_stat[i] &= reg_direction[i];
mutex_init(&chip->irq_lock);