1 files changed, 18 insertions, 14 deletions

diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index 93bf87d70961..234fdde7d40e 100644
--- a/drivers/i2c/busses/i2c-ali15x3.c
+++ b/drivers/i2c/busses/i2c-ali15x3.c
@@ -1,6 +1,4 @@
 /*
-    ali15x3.c - Part of lm_sensors, Linux kernel modules for hardware
-              monitoring
     Copyright (c) 1999  Frodo Looijaard <frodol@dds.nl> and
     Philip Edelbrock <phil@netroedge.com> and
     Mark D. Studebaker <mdsxyz123@yahoo.com>
@@ -68,6 +66,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 +165,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,
@@ -282,7 +285,7 @@ static int ali15x3_transaction(struct i2c_adapter *adap)
                         dev_err(&adap->dev, "SMBus reset failed! (0x%02x) - "
                                 "controller or device on bus is probably hung\n",
                                 temp);
-                        return -1;
+                        return -EBUSY;
                 }
         } else {
                 /* check and clear done bit */
@@ -304,12 +307,12 @@ static int ali15x3_transaction(struct i2c_adapter *adap)
 
         /* If the SMBus is still busy, we give up */
         if (timeout >= MAX_TIMEOUT) {
-                result = -1;
+                result = -ETIMEDOUT;
                 dev_err(&adap->dev, "SMBus Timeout!\n");
         }
 
         if (temp & ALI15X3_STS_TERM) {
-                result = -1;
+                result = -EIO;
                 dev_dbg(&adap->dev, "Error: Failed bus transaction\n");
         }
 
@@ -320,7 +323,7 @@ static int ali15x3_transaction(struct i2c_adapter *adap)
           This means that bus collisions go unreported.
         */
         if (temp & ALI15X3_STS_COLL) {
-                result = -1;
+                result = -ENXIO;
                 dev_dbg(&adap->dev,
                         "Error: no response or bus collision ADD=%02x\n",
                         inb_p(SMBHSTADD));
@@ -328,7 +331,7 @@ static int ali15x3_transaction(struct i2c_adapter *adap)
 
         /* haven't ever seen this */
         if (temp & ALI15X3_STS_DEV) {
-                result = -1;
+                result = -EIO;
                 dev_err(&adap->dev, "Error: device error\n");
         }
         dev_dbg(&adap->dev, "Transaction (post): STS=%02x, CNT=%02x, CMD=%02x, "
@@ -338,7 +341,7 @@ static int ali15x3_transaction(struct i2c_adapter *adap)
         return result;
 }
 
-/* Return -1 on error. */
+/* Return negative errno on error. */
 static s32 ali15x3_access(struct i2c_adapter * adap, u16 addr,
                    unsigned short flags, char read_write, u8 command,
                    int size, union i2c_smbus_data * data)
@@ -362,9 +365,6 @@ static s32 ali15x3_access(struct i2c_adapter * adap, u16 addr,
         }
 
         switch (size) {
-        case I2C_SMBUS_PROC_CALL:
-                dev_err(&adap->dev, "I2C_SMBUS_PROC_CALL not supported!\n");
-                return -1;
         case I2C_SMBUS_QUICK:
                 outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
                        SMBHSTADD);
@@ -417,12 +417,16 @@ static s32 ali15x3_access(struct i2c_adapter * adap, u16 addr,
                 }
                 size = ALI15X3_BLOCK_DATA;
                 break;
+        default:
+                dev_warn(&adap->dev, "Unsupported transaction %d\n", size);
+                return -EOPNOTSUPP;
         }
 
         outb_p(size, SMBHSTCNT);        /* output command */
 
-        if (ali15x3_transaction(adap))  /* Error in transaction */
-                return -1;
+        temp = ali15x3_transaction(adap);
+        if (temp)
+                return temp;
 
         if ((read_write == I2C_SMBUS_WRITE) || (size == ALI15X3_QUICK))
                 return 0;
@@ -470,7 +474,7 @@ static const struct i2c_algorithm smbus_algorithm = {
 static struct i2c_adapter ali15x3_adapter = {
         .owner          = THIS_MODULE,
         .id             = I2C_HW_SMBUS_ALI15X3,
-        .class          = I2C_CLASS_HWMON,
+        .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
         .algo           = &smbus_algorithm,
 };