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

torvalds · torvalds · commit 9cd42be825fa · 2024-02-23T09:01:35.000-08:00
Pull gpio fix from Bartosz Golaszewski:

 - fix a use-case where no pins are mapped to GPIOs in
   gpiochip_generic_config()

* tag 'gpio-fixes-for-v6.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpiolib: Handle no pin_ranges in gpiochip_generic_config()
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
@@ -2042,6 +2042,11 @@ EXPORT_SYMBOL_GPL(gpiochip_generic_free);
 int gpiochip_generic_config(struct gpio_chip *gc, unsigned int offset,
 			    unsigned long config)
 {
+#ifdef CONFIG_PINCTRL
+	if (list_empty(&gc->gpiodev->pin_ranges))
+		return -ENOTSUPP;
+#endif
+
 	return pinctrl_gpio_set_config(gc, offset, config);
 }
 EXPORT_SYMBOL_GPL(gpiochip_generic_config);

Original file line number	Diff line number	Diff line change
`@@ -2042,6 +2042,11 @@ EXPORT_SYMBOL_GPL(gpiochip_generic_free);`
`2042`	`2042`	`int gpiochip_generic_config(struct gpio_chip *gc, unsigned int offset,`
`2043`	`2043`	`unsigned long config)`
`2044`	`2044`	`{`
	`2045`	`+#ifdef CONFIG_PINCTRL`
	`2046`	`+ if (list_empty(&gc->gpiodev->pin_ranges))`
	`2047`	`+ return -ENOTSUPP;`
	`2048`	`+#endif`
	`2049`	`+`
`2045`	`2050`	`return pinctrl_gpio_set_config(gc, offset, config);`
`2046`	`2051`	`}`
`2047`	`2052`	`EXPORT_SYMBOL_GPL(gpiochip_generic_config);`