[alsa-devel] [PATCH] ALSA: control: remove compilation warning on 32-bit
Olof Johansson
olof at lixom.net
Sat Nov 5 03:28:45 CET 2011
This was introduced by 'ALSA: control: add support for ENUMERATED user
space controls' which adds a u64 variable that gets cast to a pointer:
sound/core/control.c: In function 'snd_ctl_elem_init_enum_names':
sound/core/control.c:1089: warning: cast to pointer from integer of different size
Since we don't support 64-bit userspace on 32-bit kernel, it's safe to
cast to long before casting to pointer to avoid the warning.
Signed-off-by: Olof Johansson <olof at lixom.net>
---
sound/core/control.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/core/control.c b/sound/core/control.c
index 978fe1a..d09c335 100644
--- a/sound/core/control.c
+++ b/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 long 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);
--
1.7.4.1
More information about the Alsa-devel
mailing list