i2c: Check for ACPI resource conflicts

[linux-2.6-omap-h63xx.git] / drivers / i2c / busses / i2c-ali15x3.c

diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index e922c3950fcdc4081c26fa3ca122f4465b116ead..a030abd3b32bb1df44b8c41da249f34ef638a404 100644 (file)
--- a/drivers/i2c/busses/i2c-ali15x3.c
+++ b/drivers/i2c/busses/i2c-ali15x3.c
@@ -68,6 +68,7 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/init.h>
+#include <linux/acpi.h>
 #include <asm/io.h>
 
 /* ALI15X3 SMBus address offsets */
@@ -166,6 +167,10 @@ static int ali15x3_setup(struct pci_dev *ALI15X3_dev)
        if(force_addr)
                ali15x3_smba = force_addr & ~(ALI15X3_SMB_IOSIZE - 1);
 
+       if (acpi_check_region(ali15x3_smba, ALI15X3_SMB_IOSIZE,
+                             ali15x3_driver.name))
+               return -EBUSY;
+
        if (!request_region(ali15x3_smba, ALI15X3_SMB_IOSIZE,
                            ali15x3_driver.name)) {
                dev_err(&ALI15X3_dev->dev,