git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
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
422721b
..
932c4fa
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);
}
err = i2c_write(adap, p->buf, p->len);
}
- return
err
;
+ return
(err < 0) ? err : i
;
}
static u32 sgi_func(struct i2c_adapter *adap)
}
static u32 sgi_func(struct i2c_adapter *adap)
@@
-158,8
+158,6
@@
static u32 sgi_func(struct i2c_adapter *adap)
}
static struct i2c_algorithm sgi_algo = {
}
static struct i2c_algorithm sgi_algo = {
- .name = "SGI algorithm",
- .id = I2C_ALGO_SGI,
.master_xfer = sgi_xfer,
.functionality = sgi_func,
};
.master_xfer = sgi_xfer,
.functionality = sgi_func,
};
@@
-169,7
+167,6
@@
static struct i2c_algorithm sgi_algo = {
*/
int i2c_sgi_add_bus(struct i2c_adapter *adap)
{
*/
int i2c_sgi_add_bus(struct i2c_adapter *adap)
{
- adap->id |= sgi_algo.id;
adap->algo = &sgi_algo;
return i2c_add_adapter(adap);
adap->algo = &sgi_algo;
return i2c_add_adapter(adap);