dmaengine: acpi-dma: check for 64-bit MMIO address

[linux-beck.git] / drivers / dma / acpi-dma.c

diff --git a/drivers/dma/acpi-dma.c b/drivers/dma/acpi-dma.c
index 16d0daa058a54ed6db7114f71aedf2714f036d5d..eed6bda01790f789116bf402bd6b14c36b641ff5 100644 (file)
--- a/drivers/dma/acpi-dma.c
+++ b/drivers/dma/acpi-dma.c
@@ -15,6 +15,7 @@
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/module.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
@@ -72,7 +73,9 @@ static int acpi_dma_parse_resource_group(const struct acpi_csrt_group *grp,
        si = (const struct acpi_csrt_shared_info *)&grp[1];
 
        /* Match device by MMIO and IRQ */
-       if (si->mmio_base_low != mem || si->gsi_interrupt != irq)
+       if (si->mmio_base_low != lower_32_bits(mem) ||
+           si->mmio_base_high != upper_32_bits(mem) ||
+           si->gsi_interrupt != irq)
                return 0;
 
        dev_dbg(&adev->dev, "matches with %.4s%04X (rev %u)\n",