Skip to content

Commit

Permalink
Merge tag 'gpio-fixes-for-v5.15-rc4' of git://git.kernel.org/pub/scm/…
Browse files Browse the repository at this point in the history
…linux/kernel/git/brgl/linux

Pull gpio fixes from Bartosz Golaszewski:
 "A single fix for the gpio-pca953x driver and two commits updating the
  MAINTAINERS entries for Mun Yew Tham (GPIO specific) and myself
  (treewide after a change in professional situation).

  Summary:

   - don't ignore I2C errors in gpio-pca953x

   - update MAINTAINERS entries for Mun Yew Tham and myself"

* tag 'gpio-fixes-for-v5.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  MAINTAINERS: Update Mun Yew Tham as Altera Pio Driver maintainer
  MAINTAINERS: update my email address
  gpio: pca953x: do not ignore i2c errors
  • Loading branch information
torvalds committed Sep 30, 2021
2 parents 78c56e5 + 040d985 commit 115f613
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 14 deletions.
10 changes: 5 additions & 5 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@ F: Documentation/devicetree/bindings/dma/altr,msgdma.yaml
F: drivers/dma/altera-msgdma.c

ALTERA PIO DRIVER
M: Joyce Ooi <joyce.ooi@intel.com>
M: Mun Yew Tham <mun.yew.tham@intel.com>
L: [email protected]
S: Maintained
F: drivers/gpio/gpio-altera.c
Expand Down Expand Up @@ -2961,7 +2961,7 @@ F: crypto/async_tx/
F: include/linux/async_tx.h

AT24 EEPROM DRIVER
M: Bartosz Golaszewski <[email protected]>
M: Bartosz Golaszewski <[email protected]>
L: [email protected]
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
Expand Down Expand Up @@ -7984,7 +7984,7 @@ F: include/linux/gpio/regmap.h

GPIO SUBSYSTEM
M: Linus Walleij <[email protected]>
M: Bartosz Golaszewski <[email protected]>
M: Bartosz Golaszewski <[email protected]>
L: [email protected]
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
Expand Down Expand Up @@ -11365,7 +11365,7 @@ F: Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.yaml
F: drivers/iio/proximity/mb1232.c

MAXIM MAX77650 PMIC MFD DRIVER
M: Bartosz Golaszewski <[email protected]>
M: Bartosz Golaszewski <[email protected]>
L: [email protected]
S: Maintained
F: Documentation/devicetree/bindings/*/*max77650.yaml
Expand Down Expand Up @@ -18682,7 +18682,7 @@ F: include/linux/clk/ti.h

TI DAVINCI MACHINE SUPPORT
M: Sekhar Nori <[email protected]>
R: Bartosz Golaszewski <[email protected]>
R: Bartosz Golaszewski <[email protected]>
L: [email protected] (moderated for non-subscribers)
S: Supported
T: git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
Expand Down
11 changes: 2 additions & 9 deletions drivers/gpio/gpio-pca953x.c
Original file line number Diff line number Diff line change
Expand Up @@ -468,15 +468,8 @@ static int pca953x_gpio_get_value(struct gpio_chip *gc, unsigned off)
mutex_lock(&chip->i2c_lock);
ret = regmap_read(chip->regmap, inreg, &reg_val);
mutex_unlock(&chip->i2c_lock);
if (ret < 0) {
/*
* NOTE:
* diagnostic already emitted; that's all we should
* do unless gpio_*_value_cansleep() calls become different
* from their nonsleeping siblings (and report faults).
*/
return 0;
}
if (ret < 0)
return ret;

return !!(reg_val & bit);
}
Expand Down

0 comments on commit 115f613

Please sign in to comment.