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

Commit 60bd7be7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'gpio-v4.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Linus writes:
  "GPIO fix for the v4.19 series:
   - Fix up the interrupt parent for the irqdomains."

* tag 'gpio-v4.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: Assign gpio_irq_chip::parents to non-stack pointer
parents ef0e75a4 3e779a2e

drivers/gpio/gpiolib.c

+2 −1
Original line number Diff line number Diff line
@@ -1682,7 +1682,8 @@ static void gpiochip_set_cascaded_irqchip(struct gpio_chip *gpiochip, 
		irq_set_chained_handler_and_data(parent_irq, parent_handler,

						 gpiochip);



		gpiochip->irq.parents = &parent_irq;

		gpiochip->irq.parent_irq = parent_irq;

		gpiochip->irq.parents = &gpiochip->irq.parent_irq;

		gpiochip->irq.num_parents = 1;

	}

include/linux/gpio/driver.h

+7 −0
Original line number Diff line number Diff line
@@ -94,6 +94,13 @@ struct gpio_irq_chip { 
	 */

	unsigned int num_parents;



	/**

	 * @parent_irq:

	 *

	 * For use by gpiochip_set_cascaded_irqchip()

	 */

	unsigned int parent_irq;



	/**

	 * @parents:

	 *