diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-29 12:34:43 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-29 12:34:43 -0300 |
| commit | bb23e654d39bbfdebbf087f9649d1e0e110c5b20 (patch) | |
| tree | 30898eac94ead8343466ca4714d9871db269595c /linux/drivers/media/video/cx25840/cx25840-core.c | |
| parent | f876c2dd29df6aadcb5982273b486a95c2e4b193 (diff) | |
| parent | 61d260e2d3239aec8f44c91e3b971621bafbbd45 (diff) | |
| download | mediapointer-dvb-s2-bb23e654d39bbfdebbf087f9649d1e0e110c5b20.tar.gz mediapointer-dvb-s2-bb23e654d39bbfdebbf087f9649d1e0e110c5b20.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tuner-refactor-phase-1
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx25840/cx25840-core.c')
| -rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c index 2a24fc38a..febda8867 100644 --- a/linux/drivers/media/video/cx25840/cx25840-core.c +++ b/linux/drivers/media/video/cx25840/cx25840-core.c @@ -144,7 +144,9 @@ static void init_dll1(struct i2c_client *client) cx25840_write(client, 0x159, 0x23); cx25840_write(client, 0x15a, 0x87); cx25840_write(client, 0x15b, 0x06); + udelay(10); cx25840_write(client, 0x159, 0xe1); + udelay(10); cx25840_write(client, 0x15a, 0x86); cx25840_write(client, 0x159, 0xe0); cx25840_write(client, 0x159, 0xe1); @@ -158,6 +160,7 @@ static void init_dll2(struct i2c_client *client) cx25840_write(client, 0x15d, 0xe3); cx25840_write(client, 0x15e, 0x86); cx25840_write(client, 0x15f, 0x06); + udelay(10); cx25840_write(client, 0x15d, 0xe1); cx25840_write(client, 0x15d, 0xe0); cx25840_write(client, 0x15d, 0xe1); @@ -176,9 +179,7 @@ static void cx25836_initialize(struct i2c_client *client) /* 3c. */ cx25840_and_or(client, 0x159, ~0x02, 0x02); /* 3d. */ - /* There should be a 10-us delay here, but since the - i2c bus already has a 10-us delay we don't need to do - anything */ + udelay(10); /* 3e. */ cx25840_and_or(client, 0x159, ~0x02, 0x00); /* 3f. */ |