From dd19a8d010ae153a5fbdf565feb970daf25a3db4 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Tue, 2 Feb 2010 13:03:31 +0100 Subject: [PATCH] --- yaml --- r: 193187 b: refs/heads/master c: b5c80bc5d70a1ce5b071ed06dd95292b9de46f95 h: refs/heads/master i: 193185: bdad345ece79d330a28314dde09860fc7d3b3c35 193183: 48c72f208a1b03f32561e8058369c9f77bac7df1 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-highlander.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3965db531129..a1d53434c879 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0ec9e20bab214f4a26e6fdaaf5c2a6b2f2640d7 +refs/heads/master: b5c80bc5d70a1ce5b071ed06dd95292b9de46f95 diff --git a/trunk/drivers/i2c/busses/i2c-highlander.c b/trunk/drivers/i2c/busses/i2c-highlander.c index ce87a902c94d..3df1bc80f37a 100644 --- a/trunk/drivers/i2c/busses/i2c-highlander.c +++ b/trunk/drivers/i2c/busses/i2c-highlander.c @@ -282,7 +282,6 @@ static int highlander_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr, union i2c_smbus_data *data) { struct highlander_i2c_dev *dev = i2c_get_adapdata(adap); - int read = read_write & I2C_SMBUS_READ; u16 tmp; init_completion(&dev->cmd_complete); @@ -337,11 +336,11 @@ static int highlander_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr, highlander_i2c_done(dev); /* Set slave address */ - iowrite16((addr << 1) | read, dev->base + SMSMADR); + iowrite16((addr << 1) | read_write, dev->base + SMSMADR); highlander_i2c_command(dev, command, dev->buf_len); - if (read) + if (read_write == I2C_SMBUS_READ) return highlander_i2c_read(dev); else return highlander_i2c_write(dev);