Merge branch 'topic/enum-info-cleanup' into for-next

this is a series of patches to just convert the plain info callback
for enum ctl elements to snd_ctl_elem_info().  Also, it includes the
extension of snd_ctl_elem_info(), for catching the unexpected string
cut-off and handling the zero items.

1 files changed, 5 insertions, 0 deletions

diff --git a/sound/core/control.c b/sound/core/control.c
index b9611344ff9e..5c35bbaf881e 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -1745,8 +1745,13 @@ int snd_ctl_enum_info(struct snd_ctl_elem_info *info, unsigned int channels,
         info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         info->count = channels;
         info->value.enumerated.items = items;
+        if (!items)
+                return 0;
         if (info->value.enumerated.item >= items)
                 info->value.enumerated.item = items - 1;
+        WARN(strlen(names[info->value.enumerated.item]) >= sizeof(info->value.enumerated.name),
+             "ALSA: too long item name '%s'\n",
+             names[info->value.enumerated.item]);
         strlcpy(info->value.enumerated.name,
                 names[info->value.enumerated.item],
                 sizeof(info->value.enumerated.name));