From 927e413faf30ffe5b42f03a128f08b71fb44aee7 Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Sat, 5 Nov 2011 22:51:54 +0100
Subject: [PATCH] --- yaml --- r: 274115 b: refs/heads/master c:
 447c6f93aba42e6889be55a614d4dddc25f17863 h: refs/heads/master i:   274113:
 54284dc00b0a844b041f9b4bdd72d12ecf68a0bd   274111:
 6840c7603cea6a431c8f1372b45b39e8d2a20cbf v: v3

---
 [refs]                     | 2 +-
 trunk/sound/core/control.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ae2cfb4ea04e..14b9c7953d21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 862a6244eb9f9f5123fe819454fcfcae0ee1f2f9
+refs/heads/master: 447c6f93aba42e6889be55a614d4dddc25f17863
diff --git a/trunk/sound/core/control.c b/trunk/sound/core/control.c
index 978fe1a8e9f0..59edb12dd542 100644
--- a/trunk/sound/core/control.c
+++ b/trunk/sound/core/control.c
@@ -1081,12 +1081,12 @@ static int snd_ctl_elem_init_enum_names(struct user_element *ue)
 	char *names, *p;
 	size_t buf_len, name_len;
 	unsigned int i;
+	const uintptr_t user_ptrval = ue->info.value.enumerated.names_ptr;
 
 	if (ue->info.value.enumerated.names_length > 64 * 1024)
 		return -EINVAL;
 
-	names = memdup_user(
-		(const void __user *)ue->info.value.enumerated.names_ptr,
+	names = memdup_user((const void __user *)user_ptrval,
 		ue->info.value.enumerated.names_length);
 	if (IS_ERR(names))
 		return PTR_ERR(names);