aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-sis5595.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/i2c/busses/i2c-sis5595.c')
-rw-r--r--drivers/i2c/busses/i2c-sis5595.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index f76944b384f5..3c8e0e1bd24f 100644
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -62,6 +62,7 @@
62#include <linux/ioport.h> 62#include <linux/ioport.h>
63#include <linux/init.h> 63#include <linux/init.h>
64#include <linux/i2c.h> 64#include <linux/i2c.h>
65#include <linux/acpi.h>
65#include <asm/io.h> 66#include <asm/io.h>
66 67
67static int blacklist[] = { 68static int blacklist[] = {
@@ -174,6 +175,11 @@ static int sis5595_setup(struct pci_dev *SIS5595_dev)
174 175
175 /* NB: We grab just the two SMBus registers here, but this may still 176 /* NB: We grab just the two SMBus registers here, but this may still
176 * interfere with ACPI :-( */ 177 * interfere with ACPI :-( */
178 retval = acpi_check_region(sis5595_base + SMB_INDEX, 2,
179 sis5595_driver.name);
180 if (retval)
181 return retval;
182
177 if (!request_region(sis5595_base + SMB_INDEX, 2, 183 if (!request_region(sis5595_base + SMB_INDEX, 2,
178 sis5595_driver.name)) { 184 sis5595_driver.name)) {
179 dev_err(&SIS5595_dev->dev, "SMBus registers 0x%04x-0x%04x already in use!\n", 185 dev_err(&SIS5595_dev->dev, "SMBus registers 0x%04x-0x%04x already in use!\n",