r8169: checks against wrong mac addresse init

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

diff --git a/drivers/i2c/busses/i2c-isch.c b/drivers/i2c/busses/i2c-isch.c
index 8d648911a7f5d137bf87b806800a03879a98d8ce..b9c01aa90036d49eb30fa841ca0e2924f98ddb82 100644 (file)
--- a/drivers/i2c/busses/i2c-isch.c
+++ b/drivers/i2c/busses/i2c-isch.c
@@ -35,6 +35,7 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/io.h>
+#include <linux/acpi.h>
 
 /* SCH SMBus address offsets */
 #define SMBHSTCNT      (0 + sch_smba)
@@ -279,6 +280,8 @@ static int __devinit sch_probe(struct pci_dev *dev,
                dev_err(&dev->dev, "SMBus base address uninitialized!\n");
                return -ENODEV;
        }
+       if (acpi_check_region(sch_smba, SMBIOSIZE, sch_driver.name))
+               return -EBUSY;
        if (!request_region(sch_smba, SMBIOSIZE, sch_driver.name)) {
                dev_err(&dev->dev, "SMBus region 0x%x already in use!\n",
                        sch_smba);