summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorQinglang Miao <miaoqinglang@huawei.com>2020-11-11 04:22:01 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-30 11:53:13 +0100
commita622848f5938f1f86e5264c516b871d0967bbea1 (patch)
tree05a63d46434dd6d217284f36021c989a7a9c7857 /drivers/media
parente1a709edc21d96f5d986c1e8d844ec19fb9c1853 (diff)
media: solo6x10: fix missing snd_card_free in error handling case
[ Upstream commit dcdff74fa6bc00c32079d0bebd620764c26f2d89 ] Fix to goto snd_error in error handling case when fails to do snd_ctl_add, as done elsewhere in this function. Fixes: 28cae868cd24 ("[media] solo6x10: move out of staging into drivers/media/pci.") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/pci/solo6x10/solo6x10-g723.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
index 906ce86437ae..d137b94869d8 100644
--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
@@ -385,7 +385,7 @@ int solo_g723_init(struct solo_dev *solo_dev)
ret = snd_ctl_add(card, snd_ctl_new1(&kctl, solo_dev));
if (ret < 0)
- return ret;
+ goto snd_error;
ret = solo_snd_pcm_init(solo_dev);
if (ret < 0)