diff options
| author | James Morris <jmorris@namei.org> | 2011-11-16 12:39:48 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-11-16 12:39:48 +1100 |
| commit | 24942c8e5cc8696064ee207ff29d4cf21f70dafc (patch) | |
| tree | 08a8221eb72ec3da7746d7d76f6f5915ce77cde7 /sound/core/control_compat.c | |
| parent | e163bc8e4a0cd1cdffadb58253f7651201722d56 (diff) | |
| parent | ff0ff78068dd8a962358dbbdafa9d6f24540d3e5 (diff) | |
| download | linux-stable-24942c8e5cc8696064ee207ff29d4cf21f70dafc.tar.gz linux-stable-24942c8e5cc8696064ee207ff29d4cf21f70dafc.tar.bz2 linux-stable-24942c8e5cc8696064ee207ff29d4cf21f70dafc.zip | |
Merge branch 'master'; commit 'v3.2-rc2' into next
Diffstat (limited to 'sound/core/control_compat.c')
| -rw-r--r-- | sound/core/control_compat.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/core/control_compat.c b/sound/core/control_compat.c index 426874429a5e..2bb95a7a8809 100644 --- a/sound/core/control_compat.c +++ b/sound/core/control_compat.c @@ -83,6 +83,8 @@ struct snd_ctl_elem_info32 { u32 items; u32 item; char name[64]; + u64 names_ptr; + u32 names_length; } enumerated; unsigned char reserved[128]; } value; @@ -372,6 +374,8 @@ static int snd_ctl_elem_add_compat(struct snd_ctl_file *file, &data32->value.enumerated, sizeof(data->value.enumerated))) goto error; + data->value.enumerated.names_ptr = + (uintptr_t)compat_ptr(data->value.enumerated.names_ptr); break; default: break; |