aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/media
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2014-12-01 19:15:20 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-12-04 16:00:47 -0200
commit71947828caef0c83d4245f7d1eaddc799b4ff1d1 (patch)
tree64729b2d464c64cb3ec0b3596c21734a28016c70 /drivers/staging/media
parent[media] mn88473: Remove uneeded check before release_firmware() (diff)
downloadlinux-dev-71947828caef0c83d4245f7d1eaddc799b4ff1d1.tar.xz
linux-dev-71947828caef0c83d4245f7d1eaddc799b4ff1d1.zip
[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>
Diffstat (limited to 'drivers/staging/media')
-rw-r--r--drivers/staging/media/mn88473/mn88473.c5
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)
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;
}