From: Julien Grossholtz Date: Thu, 7 Jan 2016 21:46:45 +0000 (-0500) Subject: gpiolib: fix chip order in gpio list X-Git-Tag: v4.5-rc1~78^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=96098df125c0;p=karo-tx-linux.git gpiolib: fix chip order in gpio list In some situations the gpio_list order is not correct. As a consequence gpiochip_find_base returns the same base number twice. This happens when a first ship is added with manual base number, then other ships are added using automatic base number. To prevent this behaviour, this patch add the new chip after the last element of the gpio list. Signed-off-by: Julien Grossholtz Signed-off-by: Linus Walleij --- diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 3db34e74bc34..a1805734aef8 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -226,8 +226,10 @@ static int gpiochip_add_to_list(struct gpio_chip *chip) */ iterator = list_last_entry(&gpio_chips, struct gpio_chip, list); - if (iterator->base + iterator->ngpio <= chip->base) - goto found; + if (iterator->base + iterator->ngpio <= chip->base) { + list_add(&chip->list, &iterator->list); + return 0; + } dev_err(chip->parent, "GPIO integer space overlap, cannot add chip\n");