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

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
...@@ -1682,7 +1682,8 @@ static void gpiochip_set_cascaded_irqchip(struct gpio_chip *gpiochip, ...@@ -1682,7 +1682,8 @@ static void gpiochip_set_cascaded_irqchip(struct gpio_chip *gpiochip,
irq_set_chained_handler_and_data(parent_irq, parent_handler, irq_set_chained_handler_and_data(parent_irq, parent_handler,
gpiochip); gpiochip);
gpiochip->irq.parents = &parent_irq; gpiochip->irq.parent_irq = parent_irq;
gpiochip->irq.parents = &gpiochip->irq.parent_irq;
gpiochip->irq.num_parents = 1; gpiochip->irq.num_parents = 1;
} }
......
...@@ -94,6 +94,13 @@ struct gpio_irq_chip { ...@@ -94,6 +94,13 @@ struct gpio_irq_chip {
*/ */
unsigned int num_parents; unsigned int num_parents;
/**
* @parent_irq:
*
* For use by gpiochip_set_cascaded_irqchip()
*/
unsigned int parent_irq;
/** /**
* @parents: * @parents:
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment