From 23cf189a1e6f978adc5aad502a9f8fa743b787a1 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Tue, 4 Sep 2012 12:03:49 -0300
Subject: [PATCH] --- yaml --- r: 331109 b: refs/heads/master c:
 ba9425bce9e162eee0741d9a94e0d6f68e0242ab h: refs/heads/master i:   331107:
 a8aca28cfd94a391c2f2c17384e767080897d522 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/pci/ivtv/ivtv-ioctl.c | 6 ++++--
 trunk/drivers/media/radio/radio-si4713.c  | 2 +-
 trunk/include/media/v4l2-ioctl.h          | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 04d25704456e..f2de3e8cf874 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e8025b9f6011a6bd69d01080d584bc95a89d02e
+refs/heads/master: ba9425bce9e162eee0741d9a94e0d6f68e0242ab
diff --git a/trunk/drivers/media/pci/ivtv/ivtv-ioctl.c b/trunk/drivers/media/pci/ivtv/ivtv-ioctl.c
index 99e35dd3d83e..d5cbb6177754 100644
--- a/trunk/drivers/media/pci/ivtv/ivtv-ioctl.c
+++ b/trunk/drivers/media/pci/ivtv/ivtv-ioctl.c
@@ -813,11 +813,13 @@ static int ivtv_g_audout(struct file *file, void *fh, struct v4l2_audioout *vin)
 	return ivtv_get_audio_output(itv, vin->index, vin);
 }
 
-static int ivtv_s_audout(struct file *file, void *fh, struct v4l2_audioout *vout)
+static int ivtv_s_audout(struct file *file, void *fh, const struct v4l2_audioout *vout)
 {
 	struct ivtv *itv = fh2id(fh)->itv;
 
-	return ivtv_get_audio_output(itv, vout->index, vout);
+	if (itv->card->video_outputs == NULL || vout->index != 0)
+		return -EINVAL;
+	return 0;
 }
 
 static int ivtv_enum_input(struct file *file, void *fh, struct v4l2_input *vin)
diff --git a/trunk/drivers/media/radio/radio-si4713.c b/trunk/drivers/media/radio/radio-si4713.c
index 5f366d16be26..1e04101485a3 100644
--- a/trunk/drivers/media/radio/radio-si4713.c
+++ b/trunk/drivers/media/radio/radio-si4713.c
@@ -83,7 +83,7 @@ static int radio_si4713_g_audout(struct file *file, void *priv,
 }
 
 static int radio_si4713_s_audout(struct file *file, void *priv,
-					struct v4l2_audioout *vao)
+					const struct v4l2_audioout *vao)
 {
 	return vao->index ? -EINVAL : 0;
 }
diff --git a/trunk/include/media/v4l2-ioctl.h b/trunk/include/media/v4l2-ioctl.h
index babbe09527cd..d4c7729e8eca 100644
--- a/trunk/include/media/v4l2-ioctl.h
+++ b/trunk/include/media/v4l2-ioctl.h
@@ -175,7 +175,7 @@ struct v4l2_ioctl_ops {
 	int (*vidioc_g_audout)         (struct file *file, void *fh,
 					struct v4l2_audioout *a);
 	int (*vidioc_s_audout)         (struct file *file, void *fh,
-					struct v4l2_audioout *a);
+					const struct v4l2_audioout *a);
 	int (*vidioc_g_modulator)      (struct file *file, void *fh,
 					struct v4l2_modulator *a);
 	int (*vidioc_s_modulator)      (struct file *file, void *fh,