]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
[media] mn88473: One function call less in mn88473_init() after error
authorMarkus Elfring <elfring@users.sourceforge.net>
Mon, 1 Dec 2014 22:15:20 +0000 (19:15 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 4 Dec 2014 18:00:47 +0000 (16:00 -0200)
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>
drivers/staging/media/mn88473/mn88473.c

index 52180bbc36165c08ba8a588acc97906d5ac00fb7..a333744b76b958df4cfc7fb002696548f0709b90 100644 (file)
@@ -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;
 }