mirror of
https://github.com/torvalds/linux.git
synced 2024-12-05 18:41:23 +00:00
[media] si2157: One function call less in si2157_init() after error
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:
parent
dc89cfcf33
commit
e358c8a60f
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user