Merge git://oss.sgi.com:8090/oss/git/rc-fixes-xfs-2.6

[linux-2.6] / drivers / i2c / busses / i2c-i801.c

diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index ac3eafa8aac02453c3c8a9b4a2d1d6d0de964cb7..1c752ddc10e283494677382963df96d98b076074 100644 (file)
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -468,8 +468,7 @@ static s32 i801_access(struct i2c_adapter * adap, u16 addr,
                return -1;
        }
 
-       if (hwpec)
-               outb_p(1, SMBAUXCTL);   /* enable hardware PEC */
+       outb_p(hwpec, SMBAUXCTL);       /* enable/disable hardware PEC */
 
        if(block)
                ret = i801_block_transaction(data, read_write, size, hwpec);
@@ -478,9 +477,6 @@ static s32 i801_access(struct i2c_adapter * adap, u16 addr,
                ret = i801_transaction();
        }
 
-       if (hwpec)
-               outb_p(0, SMBAUXCTL);   /* disable hardware PEC */
-
        if(block)
                return ret;
        if(ret)