diff options
author | Jean Delvare <jdelvare@suse.de> | 2008-07-14 16:38:33 -0400 |
---|---|---|
committer | Jean Delvare <khali@mahadeva.delvare> | 2008-07-14 16:38:33 -0400 |
commit | 54fb4a05af0a4b814e6716cfdf3fa97fc6be7a32 (patch) | |
tree | b3a258dce4f1bc8ccb58541efae444ba89f9fc55 /drivers/i2c/busses/i2c-ali15x3.c | |
parent | 2373c1801afd06d3a206376902b39a98458c9cfb (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-ali15x3.c')
-rw-r--r-- | drivers/i2c/busses/i2c-ali15x3.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c index e922c3950fcd..a030abd3b32b 100644 --- a/drivers/i2c/busses/i2c-ali15x3.c +++ b/drivers/i2c/busses/i2c-ali15x3.c | |||
@@ -68,6 +68,7 @@ | |||
68 | #include <linux/delay.h> | 68 | #include <linux/delay.h> |
69 | #include <linux/i2c.h> | 69 | #include <linux/i2c.h> |
70 | #include <linux/init.h> | 70 | #include <linux/init.h> |
71 | #include <linux/acpi.h> | ||
71 | #include <asm/io.h> | 72 | #include <asm/io.h> |
72 | 73 | ||
73 | /* ALI15X3 SMBus address offsets */ | 74 | /* ALI15X3 SMBus address offsets */ |
@@ -166,6 +167,10 @@ static int ali15x3_setup(struct pci_dev *ALI15X3_dev) | |||
166 | if(force_addr) | 167 | if(force_addr) |
167 | ali15x3_smba = force_addr & ~(ALI15X3_SMB_IOSIZE - 1); | 168 | ali15x3_smba = force_addr & ~(ALI15X3_SMB_IOSIZE - 1); |
168 | 169 | ||
170 | if (acpi_check_region(ali15x3_smba, ALI15X3_SMB_IOSIZE, | ||
171 | ali15x3_driver.name)) | ||
172 | return -EBUSY; | ||
173 | |||
169 | if (!request_region(ali15x3_smba, ALI15X3_SMB_IOSIZE, | 174 | if (!request_region(ali15x3_smba, ALI15X3_SMB_IOSIZE, |
170 | ali15x3_driver.name)) { | 175 | ali15x3_driver.name)) { |
171 | dev_err(&ALI15X3_dev->dev, | 176 | dev_err(&ALI15X3_dev->dev, |