projects/linux·commit 71947828

[media] mn88473: One function call less in mn88473_init() after error

71947828 · Markus Elfring <[email protected]> · 2014-12-01 19:15:20 -03:00

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 <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Commit
71947828caef0c83d4245f7d1eaddc799b4ff1d1
Parents
b5911384

Changes

1 files changed · +3 −2

FileStatusAddDelContent
drivers/staging/media/mn88473/mn88473.cmodified+3−2View file

drivers/staging/media/mn88473/mn88473.c

View file
diff --git a/drivers/staging/media/mn88473/mn88473.c b/drivers/staging/media/mn88473/mn88473.c
index 52180bb..a333744 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)
ret = request_firmware(&fw, fw_file, &client->dev);
if (ret) {
dev_err(&client->dev, "firmare file '%s' not found\n", fw_file);
- goto err;
+ goto err_request_firmware;
}
dev_info(&client->dev, "downloading firmware from file '%s'\n",
@@ -261,9 +261,10 @@ static int mn88473_init(struct dvb_frontend *fe)
dev->warm = true;
return 0;
+
err:
release_firmware(fw);
-
+err_request_firmware:
dev_dbg(&client->dev, "failed=%d\n", ret);
return ret;
}