Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=155c6ab9ed255745758b6aa0f266e4d40aa32a21
Commit: 155c6ab9ed255745758b6aa0f266e4d40aa32a21
Parent: 4b9b936f278163614543d66f8e8c93d5484dd148
Author: Nickolay V. Shmyrev <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 25 16:53:07 2006 -0300
Committer: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Jan 25 19:00:59 2008 -0200
V4L/DVB (6417): Report detected sound carrier into rxsubchans
Signed-off-by: Nickolay V. Shmyrev <[EMAIL PROTECTED]>
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
drivers/media/video/bt8xx/bttv-audio-hook.c | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/media/video/bt8xx/bttv-audio-hook.c
b/drivers/media/video/bt8xx/bttv-audio-hook.c
index a075198..67b6342 100644
--- a/drivers/media/video/bt8xx/bttv-audio-hook.c
+++ b/drivers/media/video/bt8xx/bttv-audio-hook.c
@@ -101,24 +101,28 @@ void gvbctv5pci_audio(struct bttv *btv, struct v4l2_tuner
*t, int set)
} else {
switch (val & 0x70) {
case 0x10:
- t->audmode = V4L2_TUNER_MODE_LANG1 |
V4L2_TUNER_MODE_LANG2;
+ t->rxsubchans = V4L2_TUNER_SUB_LANG1 |
V4L2_TUNER_SUB_LANG2;
break;
case 0x30:
- t->audmode = V4L2_TUNER_MODE_LANG2;
+ t->rxsubchans = V4L2_TUNER_SUB_LANG2;
break;
case 0x50:
- t->audmode = V4L2_TUNER_MODE_LANG1;
+ t->rxsubchans = V4L2_TUNER_SUB_LANG1;
break;
case 0x60:
- t->audmode = V4L2_TUNER_MODE_STEREO;
+ t->rxsubchans = V4L2_TUNER_SUB_STEREO;
break;
case 0x70:
- t->audmode = V4L2_TUNER_MODE_MONO;
+ t->rxsubchans = V4L2_TUNER_SUB_MONO;
break;
default:
- t->audmode = V4L2_TUNER_MODE_MONO |
V4L2_TUNER_MODE_STEREO |
- V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2;
+ t->rxsubchans = V4L2_TUNER_SUB_MONO |
+ V4L2_TUNER_SUB_STEREO |
+ V4L2_TUNER_SUB_LANG1 |
+ V4L2_TUNER_SUB_LANG2;
}
+ t->audmode = V4L2_TUNER_MODE_STEREO |
+ V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2;
}
}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
