UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] si2157: change firmware download error handling 

Rename firmare download error path goto label. Remove firmware NULL
set as NULL value is not needed anymore, due to recent change which
started using goto labels for firmware error handling.

Cc: Olli Salonen <olli.salonen@iki.fi>
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Antti Palosaari 2014-12-06 14:51:17 -03:00 committed by Mauro Carvalho Chehab
parent 8fe51725d8
commit 78dab40a51
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/tuners/si2157.c
View File

@ -81,7 +81,7 @@ static int si2157_init(struct dvb_frontend *fe)
struct si2157_dev *dev = i2c_get_clientdata(client);
int ret, len, remaining;
struct si2157_cmd cmd;
const struct firmware *fw = NULL;
const struct firmware *fw;
u8 *fw_file;
unsigned int chip_id;
@ -154,7 +154,7 @@ static int si2157_init(struct dvb_frontend *fe)
dev_err(&client->dev, "firmware file '%s' is invalid\n",
fw_file);
ret = -EINVAL;
goto fw_release_exit;
goto err_release_firmware;
}
dev_info(&client->dev, "downloading firmware from file '%s'\n",
@ -169,12 +169,11 @@ static int si2157_init(struct dvb_frontend *fe)
if (ret) {
dev_err(&client->dev, "firmware download failed %d\n",
ret);
goto fw_release_exit;
goto err_release_firmware;
}
}
release_firmware(fw);
fw = NULL;
skip_fw_download:
/* reboot the tuner with new firmware? */
@ -191,7 +190,7 @@ warm:
dev->active = true;
return 0;
fw_release_exit:
err_release_firmware:
release_firmware(fw);
err:
dev_dbg(&client->dev, "failed=%d\n", ret);