Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b35a45b authored by Holger Brunck's avatar Holger Brunck Committed by Olof Johansson
Browse files

ARM: plat-orion: make gpiochip label unique 



The former implementation adds a fix gpiochip label string
to the framework. This is confusing because orion_gpio_init
is called more than once and this ends up in different gpiochips
with the same label.

This patch adds the already present orion_gpio_chip_count to the
label string to make it unique in the system.

Signed-off-by: default avatarHolger Brunck <holger.brunck@keymile.com>
Cc: Lennert Buytenhek <kernel@wantstofly.org>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 334fef05

arch/arm/plat-orion/gpio.c

+5 −1
Original line number Diff line number Diff line
@@ -384,12 +384,16 @@ void __init orion_gpio_init(int gpio_base, int ngpio, 
	struct orion_gpio_chip *ochip;

	struct irq_chip_generic *gc;

	struct irq_chip_type *ct;

	char gc_label[16];



	if (orion_gpio_chip_count == ARRAY_SIZE(orion_gpio_chips))

		return;



	snprintf(gc_label, sizeof(gc_label), "orion_gpio%d",

		orion_gpio_chip_count);



	ochip = orion_gpio_chips + orion_gpio_chip_count;

	ochip->chip.label = "orion_gpio";

	ochip->chip.label = kstrdup(gc_label, GFP_KERNEL);

	ochip->chip.request = orion_gpio_request;

	ochip->chip.direction_input = orion_gpio_direction_input;

	ochip->chip.get = orion_gpio_get;