From 6838b21961f2851078343a6aab05c35231b2f9b9 Mon Sep 17 00:00:00 2001 From: Hartmut Hackmann Date: Fri, 6 Oct 2006 19:45:23 -0300 Subject: [PATCH] --- yaml --- r: 39567 b: refs/heads/master c: 2e7cf3ea5acc7ed57b8883cc6d35ffc06a5c95fa h: refs/heads/master i: 39565: a6a777d55ea978c553da822d772a41112a8a4ce1 39563: 6b0be6feb6ab67c77ab7d5c46d583b130ac27f15 39559: 3e8262b2ce5c3c3682a084c764a70962768445cf 39551: f65257b1baaa954484b74b0e09225442e29f2684 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7134/saa7134-video.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 11220f0ebe24..6bbb0b2179fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7844d7561307d6f8b0dd18b91f4dc6cff53848b4 +refs/heads/master: 2e7cf3ea5acc7ed57b8883cc6d35ffc06a5c95fa diff --git a/trunk/drivers/media/video/saa7134/saa7134-video.c b/trunk/drivers/media/video/saa7134/saa7134-video.c index 203302f21827..830617ea81cc 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-video.c +++ b/trunk/drivers/media/video/saa7134/saa7134-video.c @@ -2248,7 +2248,11 @@ static int radio_do_ioctl(struct inode *inode, struct file *file, t->type = V4L2_TUNER_RADIO; saa7134_i2c_call_clients(dev, VIDIOC_G_TUNER, t); - + if (dev->input->amux == TV) { + t->signal = 0xf800 - ((saa_readb(0x581) & 0x1f) << 11); + t->rxsubchans = (saa_readb(0x529) & 0x08) ? + V4L2_TUNER_SUB_STEREO : V4L2_TUNER_SUB_MONO; + } return 0; } case VIDIOC_S_TUNER: