diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 12:14:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 12:14:22 -0800 |
| commit | 9991357259a5718813881bae96d3704bb3f531e2 (patch) | |
| tree | 1d57363d0658ecdfe18bce35ffecfb9f09bb7b3b /sound/core | |
| parent | c861cd3e92d92ae946e19099f198018fcb4fd887 (diff) | |
| parent | f441917256c9727d3573ca2f89f657a75e06a262 (diff) | |
| download | blackbird-op-linux-9991357259a5718813881bae96d3704bb3f531e2.tar.gz blackbird-op-linux-9991357259a5718813881bae96d3704bb3f531e2.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Revert the check of NO_PRESENCE pincfg default bit
ALSA: hda - Fix a regression for DMA-position check with CA0110
ALSA: hda - Fix silent output regression with ALC861
ALSA: control: remove compilation warning on 32-bit
ALSA: ua101: fix crash when unplugging
Diffstat (limited to 'sound/core')
| -rw-r--r-- | 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 978fe1a8e9f0..59edb12dd542 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 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); |
