Merge branch 'topic/misc' into for-linus

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;