lkml.org 
[lkml]   [2020]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 098/251] media: wl128x: Fix an error code in fm_download_firmware()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit ef4bb63dc1f7213c08e13f6943c69cd27f69e4a3 ]

    We forgot to set "ret" on this error path.

    Fixes: e8454ff7b9a4 ("[media] drivers:media:radio: wl128x: FM Driver Common sources")

    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/radio/wl128x/fmdrv_common.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
    index c1457cf46698..db987dda356e 100644
    --- a/drivers/media/radio/wl128x/fmdrv_common.c
    +++ b/drivers/media/radio/wl128x/fmdrv_common.c
    @@ -1278,8 +1278,9 @@ static int fm_download_firmware(struct fmdev *fmdev, const u8 *fw_name)

    switch (action->type) {
    case ACTION_SEND_COMMAND: /* Send */
    - if (fmc_send_cmd(fmdev, 0, 0, action->data,
    - action->size, NULL, NULL))
    + ret = fmc_send_cmd(fmdev, 0, 0, action->data,
    + action->size, NULL, NULL);
    + if (ret)
    goto rel_fw;

    cmd_cnt++;
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-01-16 19:11    [W:4.043 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site