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

gregkh · gregkh · commit 60bd7be764e8 · 2018-10-12T12:56:25.000+02:00
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
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
@@ -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;
 	}
 
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
@@ -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:
 	 *

Original file line number	Diff line number	Diff line change
`@@ -1682,7 +1682,8 @@ static void gpiochip_set_cascaded_irqchip(struct gpio_chip *gpiochip,`
`1682`	`1682`	`irq_set_chained_handler_and_data(parent_irq, parent_handler,`
`1683`	`1683`	`gpiochip);`
`1684`	`1684`
`1685`		`- gpiochip->irq.parents = &parent_irq;`
	`1685`	`+ gpiochip->irq.parent_irq = parent_irq;`
	`1686`	`+ gpiochip->irq.parents = &gpiochip->irq.parent_irq;`
`1686`	`1687`	`gpiochip->irq.num_parents = 1;`
`1687`	`1688`	`}`
`1688`	`1689`