Commit fcc13592 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://linuxusb.bkbits.net/i2c-2.6

into home.osdl.org:/home/torvalds/v2.5/linux
parents 592924d5 e9c16459
...@@ -147,7 +147,7 @@ static s32 nforce2_access(struct i2c_adapter * adap, u16 addr, ...@@ -147,7 +147,7 @@ static s32 nforce2_access(struct i2c_adapter * adap, u16 addr,
case I2C_SMBUS_BYTE: case I2C_SMBUS_BYTE:
if (read_write == I2C_SMBUS_WRITE) if (read_write == I2C_SMBUS_WRITE)
outb_p(data->byte, NVIDIA_SMB_DATA); outb_p(command, NVIDIA_SMB_CMD);
protocol |= NVIDIA_SMB_PRTCL_BYTE; protocol |= NVIDIA_SMB_PRTCL_BYTE;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment