1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 506a0175a5a7..ec974ba9c0c4 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -157,8 +157,13 @@ int platform_get_irq(struct platform_device *dev, unsigned int num)
          * 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);
+        if (num == 0 && has_acpi_companion(&dev->dev)) {
+                int ret = acpi_dev_gpio_irq_get(ACPI_COMPANION(&dev->dev), num);
+
+                /* Our callers expect -ENXIO for missing IRQs. */
+                if (ret >= 0 || ret == -EPROBE_DEFER)
+                        return ret;
+        }
 
         return -ENXIO;
 #endif