aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-ali1535.c
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2008-07-14 16:38:33 -0400
committerJean Delvare <khali@mahadeva.delvare>2008-07-14 16:38:33 -0400
commit54fb4a05af0a4b814e6716cfdf3fa97fc6be7a32 (patch)
treeb3a258dce4f1bc8ccb58541efae444ba89f9fc55 /drivers/i2c/busses/i2c-ali1535.c
parent2373c1801afd06d3a206376902b39a98458c9cfb (diff)
i2c: Check for ACPI resource conflicts
Check for ACPI resource conflicts in i2c bus drivers. I've included all recent SMBus master drivers for PC hardware. I've voluntarily left out: * Drivers that don't run on PCs: they can't conflict with ACPI. * Bit-banged bus device drivers: it's very unlikely that ACPI would deal with such buses. Signed-off-by: Jean Delvare <jdelvare@suse.de>
Diffstat (limited to 'drivers/i2c/busses/i2c-ali1535.c')
-rw-r--r--drivers/i2c/busses/i2c-ali1535.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index 8d1d90ab3a90..442d559b1aa9 100644
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -61,6 +61,7 @@
61#include <linux/ioport.h> 61#include <linux/ioport.h>
62#include <linux/i2c.h> 62#include <linux/i2c.h>
63#include <linux/init.h> 63#include <linux/init.h>
64#include <linux/acpi.h>
64#include <asm/io.h> 65#include <asm/io.h>
65 66
66 67
@@ -159,6 +160,11 @@ static int ali1535_setup(struct pci_dev *dev)
159 goto exit; 160 goto exit;
160 } 161 }
161 162
163 retval = acpi_check_region(ali1535_smba, ALI1535_SMB_IOSIZE,
164 ali1535_driver.name);
165 if (retval)
166 goto exit;
167
162 if (!request_region(ali1535_smba, ALI1535_SMB_IOSIZE, 168 if (!request_region(ali1535_smba, ALI1535_SMB_IOSIZE,
163 ali1535_driver.name)) { 169 ali1535_driver.name)) {
164 dev_err(&dev->dev, "ALI1535_smb region 0x%x already in use!\n", 170 dev_err(&dev->dev, "ALI1535_smb region 0x%x already in use!\n",