iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] si2157: One function call less in si2157_init() after error

Browse Source 
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 <elfring@users.sourceforge.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Markus Elfring 2014-11-30 16:48:24 -03:00 committed by Mauro Carvalho Chehab
parent dc89cfcf33
commit e358c8a60f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/tuners/si2157.c
View File

@ -157,7 +157,7 @@ static int si2157_init(struct dvb_frontend *fe)
dev_err(&s->client->dev, "firmware file '%s' is invalid\n", dev_err(&s->client->dev, "firmware file '%s' is invalid\n",
fw_file); fw_file);
ret = -EINVAL; ret = -EINVAL;
goto err; goto fw_release_exit;
} }
dev_info(&s->client->dev, "downloading firmware from file '%s'\n", 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, dev_err(&s->client->dev,
"firmware download failed=%d\n", "firmware download failed=%d\n",
ret); ret);
goto err; goto fw_release_exit;
} }
} }
@ -195,9 +195,9 @@ warm:
s->active = true; s->active = true;
return 0; return 0;
err: fw_release_exit:
release_firmware(fw); release_firmware(fw);
err:
dev_dbg(&s->client->dev, "failed=%d\n", ret); dev_dbg(&s->client->dev, "failed=%d\n", ret);
return ret; return ret;
} }