1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 147f6c7ea59c..6ecbbabf1233 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -799,10 +799,24 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
 }
 EXPORT_SYMBOL_GPL(acpi_match_device);
 
+static const void *acpi_of_device_get_match_data(const struct device *dev)
+{
+        struct acpi_device *adev = ACPI_COMPANION(dev);
+        const struct of_device_id *match = NULL;
+
+        if (!acpi_of_match_device(adev, dev->driver->of_match_table, &match))
+                return NULL;
+
+        return match->data;
+}
+
 const void *acpi_device_get_match_data(const struct device *dev)
 {
         const struct acpi_device_id *match;
 
+        if (!dev->driver->acpi_match_table)
+                return acpi_of_device_get_match_data(dev);
+
         match = acpi_match_device(dev->driver->acpi_match_table, dev);
         if (!match)
                 return NULL;