lkml.org 
[lkml]   [2020]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 03/22] media: budget-core: Improve exception handling in budget_register()
    Date
    From: Chuhong Yuan <hslester96@gmail.com>

    [ Upstream commit fc0456458df8b3421dba2a5508cd817fbc20ea71 ]

    budget_register() has no error handling after its failure.
    Add the missed undo functions for error handling to fix it.

    Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
    Signed-off-by: Sean Young <sean@mess.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/pci/ttpci/budget-core.c | 11 ++++++++---
    1 file changed, 8 insertions(+), 3 deletions(-)

    diff --git a/drivers/media/pci/ttpci/budget-core.c b/drivers/media/pci/ttpci/budget-core.c
    index fadbdeeb44955..293867b9e7961 100644
    --- a/drivers/media/pci/ttpci/budget-core.c
    +++ b/drivers/media/pci/ttpci/budget-core.c
    @@ -369,20 +369,25 @@ static int budget_register(struct budget *budget)
    ret = dvbdemux->dmx.add_frontend(&dvbdemux->dmx, &budget->hw_frontend);

    if (ret < 0)
    - return ret;
    + goto err_release_dmx;

    budget->mem_frontend.source = DMX_MEMORY_FE;
    ret = dvbdemux->dmx.add_frontend(&dvbdemux->dmx, &budget->mem_frontend);
    if (ret < 0)
    - return ret;
    + goto err_release_dmx;

    ret = dvbdemux->dmx.connect_frontend(&dvbdemux->dmx, &budget->hw_frontend);
    if (ret < 0)
    - return ret;
    + goto err_release_dmx;

    dvb_net_init(&budget->dvb_adapter, &budget->dvb_net, &dvbdemux->dmx);

    return 0;
    +
    +err_release_dmx:
    + dvb_dmxdev_release(&budget->dmxdev);
    + dvb_dmx_release(&budget->demux);
    + return ret;
    }

    static void budget_unregister(struct budget *budget)
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-08-20 02:10    [W:4.173 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site