| From 2a48f4e46f9636c422c11bf150e2cd62d5fc89f9 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 24 Apr 2019 13:00:03 +0200 |
| Subject: ALSA: usb-audio: Handle the error from |
| snd_usb_mixer_apply_create_quirk() |
| |
| 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 64fa1bbf0acb3..54011f8543a72 100644 |
| --- a/sound/usb/mixer.c |
| +++ b/sound/usb/mixer.c |
| @@ -2626,7 +2626,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) |
| -- |
| 2.20.1 |
| |
