diff options
Diffstat (limited to 'drivers/media/dvb/ttpci/av7110_v4l.c')
-rw-r--r-- | drivers/media/dvb/ttpci/av7110_v4l.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c index 94cf38c7e8a8..2f23ceab8d44 100644 --- a/drivers/media/dvb/ttpci/av7110_v4l.c +++ b/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 | |||
579 | return -EFAULT; | 579 | return -EFAULT; |
580 | if ((d.id != 0 && d.id != V4L2_SLICED_WSS_625) || d.field != 0 || d.line != 23) | 580 | if ((d.id != 0 && d.id != V4L2_SLICED_WSS_625) || d.field != 0 || d.line != 23) |
581 | return -EINVAL; | 581 | return -EINVAL; |
582 | if (d.id) { | 582 | if (d.id) |
583 | av7110->wssData = ((d.data[1] << 8) & 0x3f00) | d.data[0]; | 583 | av7110->wssData = ((d.data[1] << 8) & 0x3f00) | d.data[0]; |
584 | rc = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetWSSConfig, | 584 | else |
585 | 2, 1, av7110->wssData); | 585 | av7110->wssData = 0x8000; |
586 | } else { | 586 | rc = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetWSSConfig, 2, 1, av7110->wssData); |
587 | av7110->wssData = 0; | ||
588 | rc = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetWSSConfig, 1, 0); | ||
589 | } | ||
590 | return (rc < 0) ? rc : count; | 587 | return (rc < 0) ? rc : count; |
591 | } | 588 | } |
592 | 589 | ||