diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
| commit | 0a7d5f8ce960e74fa22986bda4af488539796e49 (patch) | |
| tree | e29ad17808a5c3410518e22dae8dfe94801b59f3 /drivers/i2c/algos/i2c-algo-ite.c | |
| parent | 0165508c80a2b5d5268d9c5dfa9b30c534a33693 (diff) | |
| parent | dc709bd190c130b299ac19d596594256265c042a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/i2c/algos/i2c-algo-ite.c')
| -rw-r--r-- | drivers/i2c/algos/i2c-algo-ite.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/i2c/algos/i2c-algo-ite.c b/drivers/i2c/algos/i2c-algo-ite.c index 2db7bfc85225..70d8eefb5efc 100644 --- a/drivers/i2c/algos/i2c-algo-ite.c +++ b/drivers/i2c/algos/i2c-algo-ite.c | |||
| @@ -742,10 +742,8 @@ int i2c_iic_add_bus(struct i2c_adapter *adap) | |||
| 742 | adap->retries = 3; /* be replaced by defines */ | 742 | adap->retries = 3; /* be replaced by defines */ |
| 743 | adap->flags = 0; | 743 | adap->flags = 0; |
| 744 | 744 | ||
| 745 | i2c_add_adapter(adap); | ||
| 746 | iic_init(iic_adap); | 745 | iic_init(iic_adap); |
| 747 | 746 | return i2c_add_adapter(adap); | |
| 748 | return 0; | ||
| 749 | } | 747 | } |
| 750 | 748 | ||
| 751 | 749 | ||