diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-17 06:48:33 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-17 06:48:33 -0300 |
commit | 2fc74336805f6956eb1b58852adf962315899b82 (patch) | |
tree | e327913ed114c1d34f7d6450abbb61834cae9d5d /linux/drivers/media/dvb/ttpci/av7110_v4l.c | |
parent | d30a31decd05aa55764418cce0b9cce695885439 (diff) | |
parent | ba6db43dd8d3f7fa51679331c85c2c64c848e8db (diff) | |
download | mediapointer-dvb-s2-2fc74336805f6956eb1b58852adf962315899b82.tar.gz mediapointer-dvb-s2-2fc74336805f6956eb1b58852adf962315899b82.tar.bz2 |
Merge from mkrufky tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/ttpci/av7110_v4l.c')
-rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110_v4l.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110_v4l.c b/linux/drivers/media/dvb/ttpci/av7110_v4l.c index 94cf38c7e..2f23ceab8 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_v4l.c +++ b/linux/drivers/media/dvb/ttpci/av7110_v4l.c @@ -579,14 +579,11 @@ static ssize_t av7110_vbi_write(struct file *file, const char __user *data, size return -EFAULT; if ((d.id != 0 && d.id != V4L2_SLICED_WSS_625) || d.field != 0 || d.line != 23) return -EINVAL; - if (d.id) { + if (d.id) av7110->wssData = ((d.data[1] << 8) & 0x3f00) | d.data[0]; - rc = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetWSSConfig, - 2, 1, av7110->wssData); - } else { - av7110->wssData = 0; - rc = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetWSSConfig, 1, 0); - } + else + av7110->wssData = 0x8000; + rc = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetWSSConfig, 2, 1, av7110->wssData); return (rc < 0) ? rc : count; } |