diff options
| author | Stefan Ringel <stefan.ringel@arcor.de> | 2011-05-09 16:53:53 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 20:04:53 -0300 |
| commit | 0f6040e8929731d4294f1cffdbcb9be1523d60f0 (patch) | |
| tree | b2bebfe6ba9cf7c53d0eb84f9545a60bba8e469c /drivers/staging/tm6000/tm6000-video.c | |
| parent | b8f7bd8769f61705fd9acc1bc64539d74dfd0265 (diff) | |
[media] tm6000: change input control
change input control
Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/tm6000/tm6000-video.c')
| -rw-r--r-- | drivers/staging/tm6000/tm6000-video.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/tm6000/tm6000-video.c b/drivers/staging/tm6000/tm6000-video.c index 8b3bf7e3e39f..a9a5919c28e1 100644 --- a/drivers/staging/tm6000/tm6000-video.c +++ b/drivers/staging/tm6000/tm6000-video.c @@ -1271,6 +1271,7 @@ static int vidioc_s_tuner(struct file *file, void *priv, dprintk(dev, 3, "audio mode: %x\n", t->audmode); v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_tuner, t); + return 0; } @@ -1537,16 +1538,12 @@ static int tm6000_open(struct file *file) if (fh->radio) { dprintk(dev, V4L2_DEBUG_OPEN, "video_open: setting radio device\n"); - tm6000_set_audio_input(dev, dev->aradio); - tm6000_set_volume(dev, dev->ctl_volume); + dev->input = 5; + tm6000_set_audio_rinput(dev); v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_radio); tm6000_prepare_isoc(dev); tm6000_start_thread(dev); } - else { - tm6000_set_audio_input(dev, dev->avideo); - tm6000_set_volume(dev, dev->ctl_volume); - } return 0; } |