Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[~andy/linux] / drivers / i2c / algos / i2c-algo-sgi.c

diff --git a/drivers/i2c/algos/i2c-algo-sgi.c b/drivers/i2c/algos/i2c-algo-sgi.c
index 142505105d6f2065ce88b6bfa9f74304ff01d837..932c4fa86c7374eb9cf667ab14a8d20cc94adcbf 100644 (file)
--- a/drivers/i2c/algos/i2c-algo-sgi.c
+++ b/drivers/i2c/algos/i2c-algo-sgi.c
@@ -149,7 +149,7 @@ static int sgi_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
                        err = i2c_write(adap, p->buf, p->len);
        }
 
-       return err;
+       return (err < 0) ? err : i;
 }
 
 static u32 sgi_func(struct i2c_adapter *adap)
@@ -167,7 +167,6 @@ static struct i2c_algorithm sgi_algo = {
  */
 int i2c_sgi_add_bus(struct i2c_adapter *adap)
 {
-       adap->id |= I2C_ALGO_SGI;
        adap->algo = &sgi_algo;
 
        return i2c_add_adapter(adap);