diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-04-24 13:00:03 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-29 10:21:43 +0100 |
| commit | ca94fad7cff0c43952e82199dbe0de5889934d9d (patch) | |
| tree | fcd3cb0e688222e00223f67bf0351d0e5419ab48 | |
| parent | 5e44371ca7febd42f3fa9d372e4071d0e6b27bc9 (diff) | |
ALSA: usb-audio: Handle the error from snd_usb_mixer_apply_create_quirk()
[ 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>
| -rw-r--r-- | sound/usb/mixer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 1b81f18010d2..73149b9be29c 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -2552,7 +2552,9 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif, (err = snd_usb_mixer_status_create(mixer)) < 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) |