diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-21 17:43:02 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-21 17:43:02 -0200 |
| commit | b0084bc50abc9f710c70c170096bf2d8b2efe610 (patch) | |
| tree | 6c3e6398438340bd6388bde7e40df8959cbce7fb /linux/drivers/media/video | |
| parent | 3afac96af88bd94cf77125db2730988a0ff3b0ae (diff) | |
| parent | 7ea6ff7b86e3f2d2361cf99823f0aa886c526098 (diff) | |
| download | mediapointer-dvb-s2-b0084bc50abc9f710c70c170096bf2d8b2efe610.tar.gz mediapointer-dvb-s2-b0084bc50abc9f710c70c170096bf2d8b2efe610.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tuner
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-i2c.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/tuner-xc2028.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-i2c.c b/linux/drivers/media/video/ivtv/ivtv-i2c.c index ebf85f74e..481f76903 100644 --- a/linux/drivers/media/video/ivtv/ivtv-i2c.c +++ b/linux/drivers/media/video/ivtv/ivtv-i2c.c @@ -806,6 +806,9 @@ int init_ivtv_i2c(struct ivtv *itv) sizeof(struct i2c_adapter)); memcpy(&itv->i2c_algo, &ivtv_i2c_algo_template, sizeof(struct i2c_algo_bit_data)); + /* The mspx4xx chips need a longer delay for some reason */ + if (itv->hw_flags & IVTV_HW_MSP34XX) + itv->i2c_algo.udelay = 10; itv->i2c_algo.data = itv; itv->i2c_adap.algo_data = &itv->i2c_algo; } diff --git a/linux/drivers/media/video/tuner-xc2028.c b/linux/drivers/media/video/tuner-xc2028.c index 133ab1cfe..1e57fe744 100644 --- a/linux/drivers/media/video/tuner-xc2028.c +++ b/linux/drivers/media/video/tuner-xc2028.c @@ -888,7 +888,9 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */, */ if (new_mode == T_ANALOG_TV) { rc = send_seq(priv, {0x00, 0x00}); - } else if (!(priv->cur_fw.type & ATSC)) { + } else if (priv->cur_fw.type & ATSC) { + offset = 1750000; + } else { offset = 2750000; /* * We must adjust the offset by 500kHz in two cases in order |