Commit 115f6134 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-fixes-for-v5.15-rc4' of git://git.kernel.org/pub/scm/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
parents 78c56e53 040d985e

MAINTAINERS

+5 −5
Original line number Diff line number Diff line
@@ -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:	linux-gpio@vger.kernel.org









S:	Maintained









F:	drivers/gpio/gpio-altera.c








@@ -2961,7 +2961,7 @@ F:	crypto/async_tx/







F:	include/linux/async_tx.h

















AT24 EEPROM DRIVER









M:	Bartosz Golaszewski <bgolaszewski@baylibre.com>









M:	Bartosz Golaszewski <brgl@bgdev.pl>









L:	linux-i2c@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git








@@ -7984,7 +7984,7 @@ F:	include/linux/gpio/regmap.h















GPIO SUBSYSTEM









M:	Linus Walleij <linus.walleij@linaro.org>









M:	Bartosz Golaszewski <bgolaszewski@baylibre.com>









M:	Bartosz Golaszewski <brgl@bgdev.pl>









L:	linux-gpio@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git








@@ -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 <bgolaszewski@baylibre.com>









M:	Bartosz Golaszewski <brgl@bgdev.pl>









L:	linux-kernel@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/*/*max77650.yaml








@@ -18682,7 +18682,7 @@ F:	include/linux/clk/ti.h















TI DAVINCI MACHINE SUPPORT









M:	Sekhar Nori <nsekhar@ti.com>









R:	Bartosz Golaszewski <bgolaszewski@baylibre.com>









R:	Bartosz Golaszewski <brgl@bgdev.pl>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git

























drivers/gpio/gpio-pca953x.c



+2
−9






























Original line number
Diff line number
Diff line







@@ -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);









}