1 files changed, 4 insertions, 5 deletions

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 3ed3901369ce..f2d74d654b3c 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -759,8 +759,6 @@ static void usb_mixer_elem_free(struct snd_kcontrol *kctl)
  */
 static int get_min_max(struct usb_mixer_elem_info *cval, int default_min)
 {
-        struct snd_usb_audio *chip = cval->mixer->chip;
-
         /* for failsafe */
         cval->min = default_min;
         cval->max = cval->min + 1;
@@ -783,7 +781,7 @@ static int get_min_max(struct usb_mixer_elem_info *cval, int default_min)
                 if (get_ctl_value(cval, UAC_GET_MAX, (cval->control << 8) | minchn, &cval->max) < 0 ||
                     get_ctl_value(cval, UAC_GET_MIN, (cval->control << 8) | minchn, &cval->min) < 0) {
                         snd_printd(KERN_ERR "%d:%d: cannot get min/max values for control %d (id %d)\n",
-                                   cval->id, snd_usb_ctrl_intf(chip), cval->control, cval->id);
+                                   cval->id, snd_usb_ctrl_intf(cval->mixer->chip), cval->control, cval->id);
                         return -EINVAL;
                 }
                 if (get_ctl_value(cval, UAC_GET_RES, (cval->control << 8) | minchn, &cval->res) < 0) {
@@ -1642,9 +1640,10 @@ static int mixer_ctl_selector_info(struct snd_kcontrol *kcontrol, struct snd_ctl
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
         uinfo->value.enumerated.items = cval->max;
-        if ((int)uinfo->value.enumerated.item >= cval->max)
+        if (uinfo->value.enumerated.item >= cval->max)
                 uinfo->value.enumerated.item = cval->max - 1;
-        strcpy(uinfo->value.enumerated.name, itemlist[uinfo->value.enumerated.item]);
+        strlcpy(uinfo->value.enumerated.name, itemlist[uinfo->value.enumerated.item],
+                sizeof(uinfo->value.enumerated.name));
         return 0;
 }