lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 324/639] ALSA: usb-audio: Handle the error from snd_usb_mixer_apply_create_quirk()
    Date
    From: Takashi Iwai <tiwai@suse.de>

    [ Upstream commit 328e9f6973be2ee67862cb17bf6c0c5c5918cd72 ]

    The error from snd_usb_mixer_apply_create_quirk() is ignored in the
    current usb-audio driver code, which will continue the probing even
    after the error. Let's take it more serious.

    Fixes: 7b1eda223deb ("ALSA: usb-mixer: factor out quirks")
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/usb/mixer.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
    index d7778f2bcbf86..6ac6a09801245 100644
    --- a/sound/usb/mixer.c
    +++ b/sound/usb/mixer.c
    @@ -3480,7 +3480,9 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif,
    if (err < 0)
    goto _error;

    - snd_usb_mixer_apply_create_quirk(mixer);
    + err = snd_usb_mixer_apply_create_quirk(mixer);
    + if (err < 0)
    + goto _error;

    err = snd_device_new(chip->card, SNDRV_DEV_CODEC, mixer, &dev_ops);
    if (err < 0)
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:18    [W:4.170 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site