Commit 5265593a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-fixes-for-v6.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux 

Pull gpio fixes from Bartosz Golaszewski:

 - fix performance regression when setting values of multiple GPIO lines
   at once

 - make sure the GPIO OF xlate code doesn't end up passing an
   uninitialized local variable to GPIO core

 - update MAINTAINERS

* tag 'gpio-fixes-for-v6.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  MAINTAINERS: remove bouncing address for Nandor Han
  gpio: of: initialize local variable passed to the .of_xlate() callback
  gpiolib: fix performance regression when using gpio_chip_get_multiple()
parents 87cf461c edb47110

MAINTAINERS

+0 −7
Original line number Diff line number Diff line
@@ -27308,13 +27308,6 @@ S: Supported 
W:	http://www.marvell.com

F:	drivers/i2c/busses/i2c-xlp9xx.c









XRA1403 GPIO EXPANDER









M:	Nandor Han <nandor.han@ge.com>









L:	linux-gpio@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/gpio/gpio-xra1403.txt









F:	drivers/gpio/gpio-xra1403.c

















XTENSA XTFPGA PLATFORM SUPPORT









M:	Max Filippov <jcmvbkbc@gmail.com>









S:	Maintained

























drivers/gpio/gpiolib-of.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -708,7 +708,7 @@ struct gpio_desc *of_find_gpio(struct device_node *np, const char *con_id,







			       unsigned int idx, unsigned long *flags)









{









	char propname[32]; /* 32 is max size of property name */









	enum of_gpio_flags of_flags;









	enum of_gpio_flags of_flags = 0;









	const of_find_gpio_quirk *q;









	struct gpio_desc *desc;










































drivers/gpio/gpiolib.c



+3
−2






























Original line number
Diff line number
Diff line







@@ -3297,14 +3297,15 @@ static int gpiod_get_raw_value_commit(const struct gpio_desc *desc)







static int gpio_chip_get_multiple(struct gpio_chip *gc,









				  unsigned long *mask, unsigned long *bits)









{









	int ret;









	









	lockdep_assert_held(&gc->gpiodev->srcu);



















	if (gc->get_multiple) {









		int ret;



















		ret = gc->get_multiple(gc, mask, bits);









		if (ret > 0)









			return -EBADE;









		return ret;









	}



















	if (gc->get) {