From 3a48e5f9aeca5901be3f89d88071ec13cd22ac95 Mon Sep 17 00:00:00 2001 From: Daniel Kurtz Date: Tue, 24 Jul 2012 14:13:58 +0200 Subject: [PATCH] --- yaml --- r: 316351 b: refs/heads/master c: 37af871112e1dec1e39dfac782f0be5926be1c88 h: refs/heads/master i: 316349: 4c8c2c1201bec698e359db703e1a22c0e3e1a6bf 316347: 1908f5530d34590045b0043ef93346d8a4b22362 316343: c13c268bfb17d7710eca5d5d3a0585b9e65e915e 316335: e39c53b5f67d0ac499f0c6e06c0bc3a56f908094 316319: 0fe822ea7d089924b910b678b7bffa5cf9fdad97 316287: e3ee2f9e4493e418184523844e7197e6bf9ab119 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-i801.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 1621b0556d00..5a3ea2163643 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: edbeea63839cf0ea169c3e0737d49a96b2ca8388 +refs/heads/master: 37af871112e1dec1e39dfac782f0be5926be1c88 diff --git a/trunk/drivers/i2c/busses/i2c-i801.c b/trunk/drivers/i2c/busses/i2c-i801.c index 016fa22f1351..569a282e3347 100644 --- a/trunk/drivers/i2c/busses/i2c-i801.c +++ b/trunk/drivers/i2c/busses/i2c-i801.c @@ -104,7 +104,6 @@ /* Other settings */ #define MAX_RETRIES 400 -#define ENABLE_INT9 0 /* set to 0x01 to enable - untested */ /* I801 command constants */ #define I801_QUICK 0x00 @@ -271,7 +270,7 @@ static int i801_transaction(struct i801_priv *priv, int xact) return result; /* the current contents of SMBHSTCNT can be overwritten, since PEC, - * INTREN, SMBSCMD are passed in xact */ + * SMBSCMD are passed in xact */ outb_p(xact | SMBHSTCNT_START, SMBHSTCNT(priv)); /* We will always wait for a fraction of a second! */ @@ -323,7 +322,7 @@ static int i801_block_transaction_by_block(struct i801_priv *priv, outb_p(data->block[i+1], SMBBLKDAT(priv)); } - status = i801_transaction(priv, I801_BLOCK_DATA | ENABLE_INT9 | + status = i801_transaction(priv, I801_BLOCK_DATA | (hwpec ? SMBHSTCNT_PEC_EN : 0)); if (status) return status; @@ -376,7 +375,7 @@ static int i801_block_transaction_byte_by_byte(struct i801_priv *priv, for (i = 1; i <= len; i++) { if (i == len && read_write == I2C_SMBUS_READ) smbcmd |= SMBHSTCNT_LAST_BYTE; - outb_p(smbcmd | ENABLE_INT9, SMBHSTCNT(priv)); + outb_p(smbcmd, SMBHSTCNT(priv)); if (i == 1) outb_p(inb(SMBHSTCNT(priv)) | SMBHSTCNT_START, @@ -567,7 +566,7 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr, ret = i801_block_transaction(priv, data, read_write, size, hwpec); else - ret = i801_transaction(priv, xact | ENABLE_INT9); + ret = i801_transaction(priv, xact); /* Some BIOSes don't like it when PEC is enabled at reboot or resume time, so we forcibly disable it after every transaction. Turn off