lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 137/717] media: solo6x10: fix missing snd_card_free in error handling case
    Date
    From: Qinglang Miao <miaoqinglang@huawei.com>

    [ 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>
    ---
    drivers/media/pci/solo6x10/solo6x10-g723.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
    index 906ce86437ae3..d137b94869d82 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)
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:10    [W:4.017 / U:0.456 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site