diff options
author | Markus Elfring <elfring@users.sourceforge.net> | 2014-12-01 17:15:20 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-12-04 13:00:47 -0500 |
commit | 71947828caef0c83d4245f7d1eaddc799b4ff1d1 (patch) | |
tree | 64729b2d464c64cb3ec0b3596c21734a28016c70 | |
parent | b59113845f76b8b21946563ee538a580fc972c6c (diff) |
[media] mn88473: One function call less in mn88473_init() after error
The release_firmware() function was called by the mn88473_init() function even
if a previous function call "request_firmware" failed.
This implementation detail could be improved by the introduction of another
jump label.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r-- | drivers/staging/media/mn88473/mn88473.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/media/mn88473/mn88473.c b/drivers/staging/media/mn88473/mn88473.c index 52180bbc3616..a333744b76b9 100644 --- a/drivers/staging/media/mn88473/mn88473.c +++ b/drivers/staging/media/mn88473/mn88473.c | |||
@@ -225,7 +225,7 @@ static int mn88473_init(struct dvb_frontend *fe) | |||
225 | ret = request_firmware(&fw, fw_file, &client->dev); | 225 | ret = request_firmware(&fw, fw_file, &client->dev); |
226 | if (ret) { | 226 | if (ret) { |
227 | dev_err(&client->dev, "firmare file '%s' not found\n", fw_file); | 227 | dev_err(&client->dev, "firmare file '%s' not found\n", fw_file); |
228 | goto err; | 228 | goto err_request_firmware; |
229 | } | 229 | } |
230 | 230 | ||
231 | dev_info(&client->dev, "downloading firmware from file '%s'\n", | 231 | dev_info(&client->dev, "downloading firmware from file '%s'\n", |
@@ -261,9 +261,10 @@ static int mn88473_init(struct dvb_frontend *fe) | |||
261 | dev->warm = true; | 261 | dev->warm = true; |
262 | 262 | ||
263 | return 0; | 263 | return 0; |
264 | |||
264 | err: | 265 | err: |
265 | release_firmware(fw); | 266 | release_firmware(fw); |
266 | 267 | err_request_firmware: | |
267 | dev_dbg(&client->dev, "failed=%d\n", ret); | 268 | dev_dbg(&client->dev, "failed=%d\n", ret); |
268 | return ret; | 269 | return ret; |
269 | } | 270 | } |