summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2014-12-05 23:22:42 +0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-01-29 23:44:43 +0300
commit58f6693fa1bfe97a40e3ba5e2271893b1074f161 (patch)
treeb5787c1f0872c95a80da183e124e5766012dafdb /drivers/media
parent68c16a76c64e2cd9c0dd4bda6400a3f28e82488e (diff)
downloadlinux-58f6693fa1bfe97a40e3ba5e2271893b1074f161.tar.xz
[media] si2168: remove unneeded fw variable initialization
commit 034e1ec0ce299b9e90056793dcb3187e7add6b62 si2168: One function call less in si2168_init() after error detection That commit added goto label for error path to release firmware, but forgets to remove variable NULL set. Remove those now. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb-frontends/si2168.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
index 66b9c9ca28f4..766362ed6b52 100644
--- a/drivers/media/dvb-frontends/si2168.c
+++ b/drivers/media/dvb-frontends/si2168.c
@@ -346,7 +346,7 @@ static int si2168_init(struct dvb_frontend *fe)
struct i2c_client *client = fe->demodulator_priv;
struct si2168_dev *dev = i2c_get_clientdata(client);
int ret, len, remaining;
- const struct firmware *fw = NULL;
+ const struct firmware *fw;
u8 *fw_file;
struct si2168_cmd cmd;
unsigned int chip_id;
@@ -483,7 +483,6 @@ static int si2168_init(struct dvb_frontend *fe)
}
release_firmware(fw);
- fw = NULL;
memcpy(cmd.args, "\x01\x01", 2);
cmd.wlen = 2;