diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2020-11-24 09:12:37 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-11-24 09:13:00 +0100 |
| commit | 43906287380f962a7178059cf8da1e03d94da3e0 (patch) | |
| tree | 669a295bf922e54c9a221550bb4598c3758ba9a0 /sound/core | |
| parent | ALSA: emu10k1: Use dma_set_mask_and_coherent to simplify code (diff) | |
| parent | ALSA: usb-audio: Fix MOTU M-Series quirks (diff) | |
| download | linux-dev-43906287380f962a7178059cf8da1e03d94da3e0.tar.xz linux-dev-43906287380f962a7178059cf8da1e03d94da3e0.zip | |
Merge branch 'topic/usb-audio-refactoring' into for-next
Pull the USB audio improvement
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/control.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/control.c b/sound/core/control.c index 4373de42a5a0..3b44378b9dec 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -1539,7 +1539,7 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file, unlock: up_write(&card->controls_rwsem); - return 0; + return err; } static int snd_ctl_elem_add_user(struct snd_ctl_file *file, |