summaryrefslogtreecommitdiffstats
path: root/sound/core/control.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-12-28 15:16:53 +0100
committerMark Brown <broonie@kernel.org>2020-12-28 15:16:53 +0100
commitf81325a05e9317f09a2e4ec57a52e4e49eb42b54 (patch)
treea5a91589c9ef8e212f2899f1462cfb5c3f0130ef /sound/core/control.c
parentASoC: meson: axg-tdm-interface: fix loopback (diff)
parentLinux 5.11-rc1 (diff)
downloadlinux-f81325a05e9317f09a2e4ec57a52e4e49eb42b54.tar.xz
linux-f81325a05e9317f09a2e4ec57a52e4e49eb42b54.zip
Merge tag 'v5.11-rc1' into asoc-5.11
Linux 5.11-rc1
Diffstat (limited to 'sound/core/control.c')
-rw-r--r--sound/core/control.c2
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,