diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
| commit | 0bd2af46839ad6262d25714a6ec0365db9d6b98f (patch) | |
| tree | dcced72d230d69fd0c5816ac6dd03ab84799a93e /sound/core/control.c | |
| parent | e138a5d2356729b8752e88520cc1525fae9794ac (diff) | |
| parent | f26b90440cd74c78fe10c9bd5160809704a9627c (diff) | |
Merge ../scsi-rc-fixes-2.6
Diffstat (limited to 'sound/core/control.c')
| -rw-r--r-- | sound/core/control.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/core/control.c b/sound/core/control.c index 6973a9686b67..48ef0a09a7a7 100644 --- a/sound/core/control.c +++ b/sound/core/control.c | |||
| @@ -1018,10 +1018,6 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file, | |||
| 1018 | } | 1018 | } |
| 1019 | switch (info->type) { | 1019 | switch (info->type) { |
| 1020 | case SNDRV_CTL_ELEM_TYPE_BOOLEAN: | 1020 | case SNDRV_CTL_ELEM_TYPE_BOOLEAN: |
| 1021 | private_size = sizeof(char); | ||
| 1022 | if (info->count > 128) | ||
| 1023 | return -EINVAL; | ||
| 1024 | break; | ||
| 1025 | case SNDRV_CTL_ELEM_TYPE_INTEGER: | 1021 | case SNDRV_CTL_ELEM_TYPE_INTEGER: |
| 1026 | private_size = sizeof(long); | 1022 | private_size = sizeof(long); |
| 1027 | if (info->count > 128) | 1023 | if (info->count > 128) |