diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 21:19:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 21:19:23 -0700 |
| commit | a0486407bea3f0545ee3fcfb768b6763c5c2b459 (patch) | |
| tree | df25e25f6c5c0c3d8db2c42835174cc081af71a5 /drivers/i2c/algos/i2c-algo-pcf.c | |
| parent | 2513eb8e67a2483aecb5bf7fead7692d5aabbdcd (diff) | |
| parent | 5cab828bf0f52f3697a61aa99c54ee43844f53c0 (diff) | |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 of HEAD
* HEAD:
[PATCH] hwmon: Documentation update for abituguru
[PATCH] hwmon: Fix for first generation Abit uGuru chips
[PATCH] hwmon: New maintainer for w83791d
[PATCH] pca9539: Honor the force parameter
[PATCH] i2c-algo-bit: Wipe out dead code
[PATCH] i2c: Handle i2c_add_adapter failure in i2c algorithm drivers
[PATCH] i2c: New mailing list
[PATCH] i2c-ite: Plan for removal
[PATCH] i2c-powermac: Fix master_xfer return value
[PATCH] scx200_acb: Fix the block transactions
[PATCH] scx200_acb: Fix the state machine
[PATCH] i2c-iop3xx: Avoid addressing self
[PATCH] i2c: Fix 'ignore' module parameter handling in i2c-core
Diffstat (limited to 'drivers/i2c/algos/i2c-algo-pcf.c')
| -rw-r--r-- | drivers/i2c/algos/i2c-algo-pcf.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c index 6e498df1f71..5b24930adb5 100644 --- 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 */ - 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; } |