From aa67e7f36540590218517008bfd51c938d4d9cc1 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Tue, 5 Jul 2011 06:56:37 -0300
Subject: [PATCH] --- yaml --- r: 261457 b: refs/heads/master c:
 adf41b9bc35a7406ead7875f66ee879dbd4cc308 h: refs/heads/master i:   261455:
 162d1e435d5f97be38d386cdc861bd5b2ee4e62a v: v3

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

diff --git a/[refs] b/[refs]
index 50b5a98563de..0c0024492af7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3aec98c1d3beaba9b96a7f00046bc06e59d6ab9
+refs/heads/master: adf41b9bc35a7406ead7875f66ee879dbd4cc308
diff --git a/trunk/drivers/media/video/v4l2-ctrls.c b/trunk/drivers/media/video/v4l2-ctrls.c
index 37a50e57f222..1f84b9676f10 100644
--- a/trunk/drivers/media/video/v4l2-ctrls.c
+++ b/trunk/drivers/media/video/v4l2-ctrls.c
@@ -1929,7 +1929,7 @@ static int try_set_ext_ctrls(struct v4l2_fh *fh, struct v4l2_ctrl_handler *hdl,
 		if (!ret) {
 			idx = i;
 			do {
-				ret = user_to_new(cs->controls + idx,
+				ret = new_to_user(cs->controls + idx,
 						helpers[idx].ctrl);
 				idx = helpers[idx].next;
 			} while (!ret && idx);