summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/tvaudio.c4
-rw-r--r--v4l/ChangeLog8
2 files changed, 10 insertions, 2 deletions
diff --git a/linux/drivers/media/video/tvaudio.c b/linux/drivers/media/video/tvaudio.c
index ba4924cb1..a878a1011 100644
--- a/linux/drivers/media/video/tvaudio.c
+++ b/linux/drivers/media/video/tvaudio.c
@@ -1747,12 +1747,12 @@ static int chip_command(struct i2c_client *client,
struct v4l2_tuner *vt = arg;
int mode = VIDEO_SOUND_MONO;
+ if (chip->radio)
+ break;
vt->audmode = 0;
vt->rxsubchans = 0;
vt->capability = V4L2_TUNER_CAP_STEREO |
V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2;
- if (chip->radio)
- break;
if (desc->getmode)
mode = desc->getmode(chip);
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 884a712da..7758998eb 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-29 21:16 hverkuil
+
+ * linux/drivers/media/video/tvaudio.c: (chip_command):
+ - When in radio mode don't do anything with VIDIOC_G_TUNER.
+ Allow other devices to fill this.
+
+ Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
+
2005-12-29 17:47 hverkuil
* linux/drivers/media/video/saa7115.c: (saa7115_set_v4lstd):