Skip to content

Commit 5265593

Browse files
committed
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()
2 parents 87cf461 + edb4711 commit 5265593

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

MAINTAINERS

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27308,13 +27308,6 @@ S: Supported
2730827308
W: http://www.marvell.com
2730927309
F: drivers/i2c/busses/i2c-xlp9xx.c
2731027310

27311-
XRA1403 GPIO EXPANDER
27312-
M: Nandor Han <[email protected]>
27313-
27314-
S: Maintained
27315-
F: Documentation/devicetree/bindings/gpio/gpio-xra1403.txt
27316-
F: drivers/gpio/gpio-xra1403.c
27317-
2731827311
XTENSA XTFPGA PLATFORM SUPPORT
2731927312
M: Max Filippov <[email protected]>
2732027313
S: Maintained

drivers/gpio/gpiolib-of.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ struct gpio_desc *of_find_gpio(struct device_node *np, const char *con_id,
708708
unsigned int idx, unsigned long *flags)
709709
{
710710
char propname[32]; /* 32 is max size of property name */
711-
enum of_gpio_flags of_flags;
711+
enum of_gpio_flags of_flags = 0;
712712
const of_find_gpio_quirk *q;
713713
struct gpio_desc *desc;
714714

drivers/gpio/gpiolib.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3297,14 +3297,15 @@ static int gpiod_get_raw_value_commit(const struct gpio_desc *desc)
32973297
static int gpio_chip_get_multiple(struct gpio_chip *gc,
32983298
unsigned long *mask, unsigned long *bits)
32993299
{
3300-
int ret;
3301-
33023300
lockdep_assert_held(&gc->gpiodev->srcu);
33033301

33043302
if (gc->get_multiple) {
3303+
int ret;
3304+
33053305
ret = gc->get_multiple(gc, mask, bits);
33063306
if (ret > 0)
33073307
return -EBADE;
3308+
return ret;
33083309
}
33093310

33103311
if (gc->get) {

0 commit comments

Comments
 (0)