diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
| commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
| tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /drivers/i2c/algos/i2c-algo-ite.c | |
| parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
Merge branch 'from-linus' into upstream
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 | ||