From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 9 Nov 2005 05:37:50 +0000 (-0800)
Subject: [PATCH] v4l: 810: vidioc log status is added to videodev2.h
X-Git-Tag: Ubuntu-5.0.0-8.9~53628
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=bf7e26ee5fce3eb1074ba3e1c8f265cb37c8451c;p=mirror_ubuntu-disco-kernel.git

[PATCH] v4l: 810: vidioc log status is added to videodev2.h

- VIDIOC_LOG_STATUS is added to videodev2.h this can be enabled
          again in wm8775.c. Also use the v4l2 VIDIOC_S_FREQUENCY instead of
          VIDIOCSFREQ.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
index 5bd592673b94..7d90ae5a99bc 100644
--- a/drivers/media/video/wm8775.c
+++ b/drivers/media/video/wm8775.c
@@ -112,8 +112,13 @@ static int wm8775_command(struct i2c_client *client, unsigned int cmd,
 		state->muted = 0;
 		break;
 
+	case VIDIOC_LOG_STATUS:
+		wm8775_info("Input: %s%s\n",
+			    state->input == 8 ? "radio" : "default",
+			    state->muted ? " (muted)" : "");
+		break;
 
-	case VIDIOCSFREQ:
+	case VIDIOC_S_FREQUENCY:
 		/* If I remove this, then it can happen that I have no
 		   sound the first time I tune from static to a valid channel.
 		   It's difficult to reproduce and is almost certainly related