| From f7745bd8a2a8ab9ed846ad3fce2e3576d603b0bb Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 6 Mar 2019 02:27:43 -0500 |
| Subject: media: wl128x: Fix an error code in fm_download_firmware() |
| |
| 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 c1457cf466981..db987dda356e0 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 |
| |
