]> err.no Git - linux-2.6/commitdiff
[PATCH] v4l: 810: vidioc log status is added to videodev2.h
authorHans Verkuil <hverkuil@xs4all.nl>
Wed, 9 Nov 2005 05:37:50 +0000 (21:37 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 9 Nov 2005 15:56:21 +0000 (07:56 -0800)
- 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>
drivers/media/video/wm8775.c

index 5bd592673b945d981b8e78b87746751cd034546e..7d90ae5a99bc55e717ec8d37d4da43c6cf2f2088 100644 (file)
@@ -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