ALSA: usb-audio: Drop superfluous error message after disconnection

[linux-2.6-microblaze.git] / sound / usb / mixer.c

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index a20af92..60d3943 100644 (file)
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -361,9 +361,8 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request,
 
        memset(buf, 0, sizeof(buf));
 
-       ret = snd_usb_lock_shutdown(chip) ? -EIO : 0;
-       if (ret)
-               goto error;
+       if (snd_usb_lock_shutdown(chip))
+               return -EIO;
 
        idx = mixer_ctrl_intf(cval->head.mixer) | (cval->head.id << 8);
        ret = snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), bRequest,
@@ -372,7 +371,6 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request,
        snd_usb_unlock_shutdown(chip);
 
        if (ret < 0) {
-error:
                usb_audio_dbg(chip,
                        "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n",
                        request, validx, idx, cval->val_type);