aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb-frontends/si2168.c
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2014-11-19 22:23:15 (GMT)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-25 14:12:01 (GMT)
commit034e1ec0ce299b9e90056793dcb3187e7add6b62 (patch)
treee8990347cd8705380b53646eaa68f82351a7b40a /drivers/media/dvb-frontends/si2168.c
parent5ed0cf8800c4da58e1e501f7143154897d34e9c2 (diff)
[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>
Diffstat (limited to 'drivers/media/dvb-frontends/si2168.c')
-rw-r--r--drivers/media/dvb-frontends/si2168.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
index 34206f3..bec3aa5 100644
--- 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;
}

Privacy Policy