Skip to content

Commit 0c2e31d

Browse files
committed
Merge tag 'gpio-updates-for-v5.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio fixes from Bartosz Golaszewski: - revert a patch intruducing breakage in interrupt handling in gpio-mpc8xxx - correctly handle missing IRQs in gpio-tqmx86 by really making them optional * tag 'gpio-updates-for-v5.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: gpio: tqmx86: really make IRQ optional Revert "gpio: mpc8xxx: change the gpio interrupt flags."
2 parents d5ad8ec + 9b87f43 commit 0c2e31d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

drivers/gpio/gpio-mpc8xxx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ static int mpc8xxx_probe(struct platform_device *pdev)
405405

406406
ret = devm_request_irq(&pdev->dev, mpc8xxx_gc->irqn,
407407
mpc8xxx_gpio_irq_cascade,
408-
IRQF_SHARED, "gpio-cascade",
408+
IRQF_NO_THREAD | IRQF_SHARED, "gpio-cascade",
409409
mpc8xxx_gc);
410410
if (ret) {
411411
dev_err(&pdev->dev,

drivers/gpio/gpio-tqmx86.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ static int tqmx86_gpio_probe(struct platform_device *pdev)
238238
struct resource *res;
239239
int ret, irq;
240240

241-
irq = platform_get_irq(pdev, 0);
242-
if (irq < 0)
241+
irq = platform_get_irq_optional(pdev, 0);
242+
if (irq < 0 && irq != -ENXIO)
243243
return irq;
244244

245245
res = platform_get_resource(pdev, IORESOURCE_IO, 0);
@@ -278,7 +278,7 @@ static int tqmx86_gpio_probe(struct platform_device *pdev)
278278

279279
pm_runtime_enable(&pdev->dev);
280280

281-
if (irq) {
281+
if (irq > 0) {
282282
struct irq_chip *irq_chip = &gpio->irq_chip;
283283
u8 irq_status;
284284

0 commit comments

Comments
 (0)