diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 04:32:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 04:32:56 -0400 |
| commit | 896395c290f902576270d84291c1f7f8bfbe339d (patch) | |
| tree | 650114bff3a5f808ee1d713ecc443b0eaab2e1c3 /drivers/media/video/cx18/cx18-i2c.c | |
| parent | af1cf204ba2fd8135933a2e4df523fb1112dc0e2 (diff) | |
| parent | 1b40a895df6c7d5a80e71f65674060b03d84bbef (diff) | |
Merge branch 'linus' into tmp.x86.mpparse.new
Diffstat (limited to 'drivers/media/video/cx18/cx18-i2c.c')
| -rw-r--r-- | drivers/media/video/cx18/cx18-i2c.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c index 1d6c51a75313..680bc4e35b79 100644 --- a/drivers/media/video/cx18/cx18-i2c.c +++ b/drivers/media/video/cx18/cx18-i2c.c | |||
| @@ -405,6 +405,8 @@ int init_cx18_i2c(struct cx18 *cx) | |||
| 405 | cx18_setscl(&cx->i2c_algo_cb_data[1], 1); | 405 | cx18_setscl(&cx->i2c_algo_cb_data[1], 1); |
| 406 | cx18_setsda(&cx->i2c_algo_cb_data[1], 1); | 406 | cx18_setsda(&cx->i2c_algo_cb_data[1], 1); |
| 407 | 407 | ||
| 408 | cx18_reset_i2c_slaves_gpio(cx); | ||
| 409 | |||
| 408 | return i2c_bit_add_bus(&cx->i2c_adap[0]) || | 410 | return i2c_bit_add_bus(&cx->i2c_adap[0]) || |
| 409 | i2c_bit_add_bus(&cx->i2c_adap[1]); | 411 | i2c_bit_add_bus(&cx->i2c_adap[1]); |
| 410 | } | 412 | } |