[media] si2168: One function call less in si2168_init() after error detection

GIT_AUTHOR_DATE=1416472767
The release_firmware() function was called in some cases by the
si2168_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 <elfring@users.sourceforge.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
index 34206f3fe497cdd702e857af33ab94a40312c151..bec3aa5ed0a07cefe55cb805acca334ddf5213dd 100644 (file)
--- a/drivers/media/dvb-frontends/si2168.c
+++ b/drivers/media/dvb-frontends/si2168.c
@@ -455,7 +455,7 @@ static int si2168_init(struct dvb_frontend *fe)
                        dev_err(&s->client->dev,
                                        "firmware file '%s' not found\n",
                                        fw_file);
-                       goto err;
+                       goto error_fw_release;
                }
        }
 
@@ -475,7 +475,7 @@ static int si2168_init(struct dvb_frontend *fe)
                        dev_err(&s->client->dev,
                                        "firmware download failed=%d\n",
                                        ret);
-                       goto err;
+                       goto error_fw_release;
                }
        }
 
@@ -506,9 +506,10 @@ warm:
        s->active = true;
 
        return 0;
-err:
-       release_firmware(fw);
 
+error_fw_release:
+       release_firmware(fw);
+err:
        dev_dbg(&s->client->dev, "failed=%d\n", ret);
        return ret;
 }