[PATCH 2/2] [media] mn88472: One function call less in mn88472_init() after error detection

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Sun, 1 Feb 2015 19:34:37 +0100

The release_firmware() function was called in three cases by the mn88472_init()
function during error handling even if the passed variable "fw" contained still
a null pointer.

This implementation detail could be improved by the introduction of another
jump label.

Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net>
---
 drivers/staging/media/mn88472/mn88472.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/media/mn88472/mn88472.c 
b/drivers/staging/media/mn88472/mn88472.c
index e7874ae..3975a57 100644
--- a/drivers/staging/media/mn88472/mn88472.c
+++ b/drivers/staging/media/mn88472/mn88472.c
@@ -286,7 +286,7 @@ static int mn88472_init(struct dvb_frontend *fe)
 
        ret = regmap_write(dev->regmap[0], 0xf5, 0x03);
        if (ret)
-               goto err;
+               goto firmware_release;
 
        for (remaining = fw->size; remaining > 0;
                        remaining -= (dev->i2c_wr_max - 1)) {
@@ -299,13 +299,13 @@ static int mn88472_init(struct dvb_frontend *fe)
                if (ret) {
                        dev_err(&client->dev,
                                        "firmware download failed=%d\n", ret);
-                       goto err;
+                       goto firmware_release;
                }
        }
 
        ret = regmap_write(dev->regmap[0], 0xf5, 0x00);
        if (ret)
-               goto err;
+               goto firmware_release;
 
        release_firmware(fw);
        fw = NULL;
@@ -314,9 +314,9 @@ static int mn88472_init(struct dvb_frontend *fe)
        dev->warm = true;
 
        return 0;
-err:
+firmware_release:
        release_firmware(fw);
-
+err:
        dev_dbg(&client->dev, "failed=%d\n", ret);
        return ret;
 }
-- 
2.2.2

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html