summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-07-03 00:57:28 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-07-03 00:57:28 +0000
commitbaa52f41b316708d50ad39912800718637f7cef2 (patch)
tree255673d508a3256cf1a106f2fbe04ddc53c791ae
parent78badebc2e534316f98cafe175f2e4f2096e79fa (diff)
downloadmediapointer-dvb-s2-baa52f41b316708d50ad39912800718637f7cef2.tar.gz
mediapointer-dvb-s2-baa52f41b316708d50ad39912800718637f7cef2.tar.bz2
* tuner-core.c:
- Reintroduced check for is_stereo pointer eliminated on previous cleanup. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
-rw-r--r--linux/drivers/media/video/tuner-core.c18
-rw-r--r--v4l/ChangeLog10
2 files changed, 20 insertions, 8 deletions
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 3d14c424a..cccddaeef 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -1,5 +1,5 @@
/*
- * $Id: tuner-core.c,v 1.45 2005/07/03 00:22:14 nsh Exp $
+ * $Id: tuner-core.c,v 1.46 2005/07/03 00:57:28 mchehab Exp $
*
* i2c tv tuner chip device driver
* core core, i.e. kernel interfaces, registering and so on
@@ -602,13 +602,15 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
if (t->has_signal)
tuner->signal = t->has_signal(client);
- if (t->is_stereo(client)) {
- tuner->rxsubchans =
- V4L2_TUNER_SUB_STEREO |
- V4L2_TUNER_SUB_MONO;
- } else {
- tuner->rxsubchans =
- V4L2_TUNER_SUB_MONO;
+ if (t->is_stereo) {
+ if (t->is_stereo(client)) {
+ tuner->rxsubchans =
+ V4L2_TUNER_SUB_STEREO |
+ V4L2_TUNER_SUB_MONO;
+ } else {
+ tuner->rxsubchans =
+ V4L2_TUNER_SUB_MONO;
+ }
}
tuner->capability |=
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index ea520e39b..682a902ed 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-03 00:55 mchehab
+ * tuner-core.c:
+
+ - Reintroduced check for is_stereo pointer eliminated on previous
+ cleanup.
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-07-03 04:19 nshmyrev
* Make.config, tuner-core.c, tuner.h:
@@ -12,6 +20,8 @@
Rename v4l2_tuner field in tun_addr structure. Cleanup
tuner private calls.
+ Signed-Off-By: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
+
2005-07-02 19:17 nshmyrev
* Make.config: