From b91da16083b19b98a830b179157822fd7be17548 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Tue, 6 Apr 2010 08:12:21 -0300
Subject: [PATCH] --- yaml --- r: 192949 b: refs/heads/master c:
 1d94aa369da073acff26fa98ad6b2168cb028ab1 h: refs/heads/master i:   192947:
 a81519904315deeb98c5ec74839025ac144fa05d v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/video/v4l2-ioctl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cbd716de3c90..c5c7a120e1c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea64f8c2204cd8b9a95072c7ef85cc9a120a2693
+refs/heads/master: 1d94aa369da073acff26fa98ad6b2168cb028ab1
diff --git a/trunk/drivers/media/video/v4l2-ioctl.c b/trunk/drivers/media/video/v4l2-ioctl.c
index 7d59c107f13b..d6975f9c3722 100644
--- a/trunk/drivers/media/video/v4l2-ioctl.c
+++ b/trunk/drivers/media/video/v4l2-ioctl.c
@@ -2006,7 +2006,7 @@ long video_ioctl2(struct file *file,
 {
 	char	sbuf[128];
 	void    *mbuf = NULL;
-	void	*parg = NULL;
+	void	*parg = (void *)arg;
 	long	err  = -EINVAL;
 	int     is_ext_ctrl;
 	size_t  ctrls_size = 0;