summaryrefslogtreecommitdiffstats
path: root/sound/core/control.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-05-27 08:02:59 +0200
committerTakashi Iwai <tiwai@suse.de>2011-05-27 08:02:59 +0200
commitd1227e3fe0c63a258db855f4f1536b0b34cd8725 (patch)
treed1fba37609a1b357eeb1051d0a6709385dd3bf90 /sound/core/control.c
parent9477c58e3308f54a108a5d1eb9621830b329b0ca (diff)
parent78fa2c4d2465d014e67d3e12d948425856587251 (diff)
downloadlinux-d1227e3fe0c63a258db855f4f1536b0b34cd8725.tar.bz2
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound/core/control.c')
-rw-r--r--sound/core/control.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/core/control.c b/sound/core/control.c
index 5d98194bcad5..f8c5be464510 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -704,13 +704,12 @@ static int snd_ctl_elem_list(struct snd_card *card,
struct snd_ctl_elem_list list;
struct snd_kcontrol *kctl;
struct snd_ctl_elem_id *dst, *id;
- unsigned int offset, space, first, jidx;
+ unsigned int offset, space, jidx;
if (copy_from_user(&list, _list, sizeof(list)))
return -EFAULT;
offset = list.offset;
space = list.space;
- first = 0;
/* try limit maximum space */
if (space > 16384)
return -ENOMEM;