diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
| commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
| tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /drivers/i2c/busses/i2c-piix4.c | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/i2c/busses/i2c-piix4.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-piix4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c index 1f80ba9da6f1..6d34ee381ce1 100644 --- a/drivers/i2c/busses/i2c-piix4.c +++ b/drivers/i2c/busses/i2c-piix4.c | |||
| @@ -243,7 +243,7 @@ static int piix4_transaction(void) | |||
| 243 | /* Make sure the SMBus host is ready to start transmitting */ | 243 | /* Make sure the SMBus host is ready to start transmitting */ |
| 244 | if ((temp = inb_p(SMBHSTSTS)) != 0x00) { | 244 | if ((temp = inb_p(SMBHSTSTS)) != 0x00) { |
| 245 | dev_dbg(&piix4_adapter.dev, "SMBus busy (%02x). " | 245 | dev_dbg(&piix4_adapter.dev, "SMBus busy (%02x). " |
| 246 | "Resetting... \n", temp); | 246 | "Resetting...\n", temp); |
| 247 | outb_p(temp, SMBHSTSTS); | 247 | outb_p(temp, SMBHSTSTS); |
| 248 | if ((temp = inb_p(SMBHSTSTS)) != 0x00) { | 248 | if ((temp = inb_p(SMBHSTSTS)) != 0x00) { |
| 249 | dev_err(&piix4_adapter.dev, "Failed! (%02x)\n", temp); | 249 | dev_err(&piix4_adapter.dev, "Failed! (%02x)\n", temp); |