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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
i2c
/
algos
/
i2c-algo-pcf.c
diff --git
a/drivers/i2c/algos/i2c-algo-pcf.c
b/drivers/i2c/algos/i2c-algo-pcf.c
index
6e498df
..
5b24930
100644
(file)
--- a/
drivers/i2c/algos/i2c-algo-pcf.c
+++ b/
drivers/i2c/algos/i2c-algo-pcf.c
@@
-479,9
+479,11
@@
int i2c_pcf_add_bus(struct i2c_adapter *adap)
adap->timeout = 100; /* default values, should */
adap->retries = 3; /* be replaced by defines */
adap->timeout = 100; /* default values, should */
adap->retries = 3; /* be replaced by defines */
- rval = pcf_init_8584(pcf_adap);
- if (!rval)
- i2c_add_adapter(adap);
+ if ((rval = pcf_init_8584(pcf_adap)))
+ return rval;
+
+ rval = i2c_add_adapter(adap);
+
return rval;
}
return rval;
}