[PATCH 2/2] [media] tuners-si2157: One function call less in si2157_init() after error detection

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Sun, 30 Nov 2014 20:48:24 +0100

The release_firmware() function was called in some cases by the si2157_init()
function during error handling even if the passed variable 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/media/tuners/si2157.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c
index e17ab1f..2180de9 100644
--- a/drivers/media/tuners/si2157.c
+++ b/drivers/media/tuners/si2157.c
@@ -157,7 +157,7 @@ static int si2157_init(struct dvb_frontend *fe)
                dev_err(&s->client->dev, "firmware file '%s' is invalid\n",
                                fw_file);
                ret = -EINVAL;
-               goto err;
+               goto fw_release_exit;
        }
 
        dev_info(&s->client->dev, "downloading firmware from file '%s'\n",
@@ -173,7 +173,7 @@ static int si2157_init(struct dvb_frontend *fe)
                        dev_err(&s->client->dev,
                                        "firmware download failed=%d\n",
                                        ret);
-                       goto err;
+                       goto fw_release_exit;
                }
        }
 
@@ -195,9 +195,9 @@ warm:
        s->active = true;
        return 0;
 
-err:
+fw_release_exit:
        release_firmware(fw);
-
+err:
        dev_dbg(&s->client->dev, "failed=%d\n", ret);
        return ret;
 }
-- 
2.1.3

--
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