From 78dab40a51fc4370744ba38b5d8b9c3294c8c136 Mon Sep 17 00:00:00 2001 From: Antti Palosaari Date: Sat, 6 Dec 2014 14:51:17 -0300 Subject: [PATCH] [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 Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab --- drivers/media/tuners/si2157.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c index 88afb2a..6174c8e 100644 --- a/drivers/media/tuners/si2157.c +++ b/drivers/media/tuners/si2157.c @@ -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); -- 2.7.4