summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-03-23 18:53:18 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-03-23 18:53:18 -0300
commit15daef71fb04bcd5f34f4576390141982b4907e8 (patch)
tree04e965a239f39a69367a87bcee12a0af92abeeb0 /linux/drivers/media/video
parent462eeaf510ade76bcdf8c2f0ff535459c244c4cb (diff)
downloadmediapointer-dvb-s2-15daef71fb04bcd5f34f4576390141982b4907e8.tar.gz
mediapointer-dvb-s2-15daef71fb04bcd5f34f4576390141982b4907e8.tar.bz2
Fix pll input logic for nxt200x/tuv1236d
From: Mauro Carvalho Chehab <mchehab@infradead.org> This patch fixes a few troubles on nxt200x implementation: 1) A nxt200x internal input control logic were done on both cx88-dvb and saa7134-dvb; 2) The nx200x_set_pll_input callback were filling buffer, at the 5th position, without even testing if that buffer were filled; 3) a 5 byte buffer were written to the device, even if the buffer were not properly initialized by calc_regs. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/cx88/cx88-dvb.c11
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-dvb.c11
2 files changed, 2 insertions, 20 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c
index 2327b32fd..10e2df75f 100644
--- a/linux/drivers/media/video/cx88/cx88-dvb.c
+++ b/linux/drivers/media/video/cx88/cx88-dvb.c
@@ -371,18 +371,9 @@ static int nxt200x_set_ts_param(struct dvb_frontend* fe, int is_punctured)
return 0;
}
-static int nxt200x_set_pll_input(u8* buf, int input)
-{
- if (input)
- buf[3] |= 0x08;
- else
- buf[3] &= ~0x08;
- return 0;
-}
-
static struct nxt200x_config ati_hdtvwonder = {
.demod_address = 0x0a,
- .set_pll_input = nxt200x_set_pll_input,
+ .is_tuv1236d = 1,
.set_ts_params = nxt200x_set_ts_param,
};
diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c
index 752e90e97..351f1d063 100644
--- a/linux/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c
@@ -945,18 +945,9 @@ static struct nxt200x_config avertvhda180 = {
.demod_address = 0x0a,
};
-static int nxt200x_set_pll_input(u8 *buf, int input)
-{
- if (input)
- buf[3] |= 0x08;
- else
- buf[3] &= ~0x08;
- return 0;
-}
-
static struct nxt200x_config kworldatsc110 = {
.demod_address = 0x0a,
- .set_pll_input = nxt200x_set_pll_input,
+ .is_tuv1236d = 1,
};
/* ==================================================================