1 files changed, 14 insertions, 1 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 1c958eb33ef4..0d3611cd1b3b 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -127,7 +127,20 @@ int platform_get_irq(struct platform_device *dev, unsigned int num)
                 irqd_set_trigger_type(irqd, r->flags & IORESOURCE_BITS);
         }
 
-        return r ? r->start : -ENXIO;
+        if (r)
+                return r->start;
+
+        /*
+         * For the index 0 interrupt, allow falling back to GpioInt
+         * resources. While a device could have both Interrupt and GpioInt
+         * resources, making this fallback ambiguous, in many common cases
+         * the device will only expose one IRQ, and this fallback
+         * allows a common code path across either kind of resource.
+         */
+        if (num == 0 && has_acpi_companion(&dev->dev))
+                return acpi_dev_gpio_irq_get(ACPI_COMPANION(&dev->dev), num);
+
+        return -ENXIO;
 #endif
 }
 EXPORT_SYMBOL_GPL(platform_get_irq);