aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2014-12-05 15:22:42 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-01-29 15:44:43 -0500
commit58f6693fa1bfe97a40e3ba5e2271893b1074f161 (patch)
treeb5787c1f0872c95a80da183e124e5766012dafdb
parent68c16a76c64e2cd9c0dd4bda6400a3f28e82488e (diff)
[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>
-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)
346 struct i2c_client *client = fe->demodulator_priv; 346 struct i2c_client *client = fe->demodulator_priv;
347 struct si2168_dev *dev = i2c_get_clientdata(client); 347 struct si2168_dev *dev = i2c_get_clientdata(client);
348 int ret, len, remaining; 348 int ret, len, remaining;
349 const struct firmware *fw = NULL; 349 const struct firmware *fw;
350 u8 *fw_file; 350 u8 *fw_file;
351 struct si2168_cmd cmd; 351 struct si2168_cmd cmd;
352 unsigned int chip_id; 352 unsigned int chip_id;
@@ -483,7 +483,6 @@ static int si2168_init(struct dvb_frontend *fe)
483 } 483 }
484 484
485 release_firmware(fw); 485 release_firmware(fw);
486 fw = NULL;
487 486
488 memcpy(cmd.args, "\x01\x01", 2); 487 memcpy(cmd.args, "\x01\x01", 2);
489 cmd.wlen = 2; 488 cmd.wlen = 2;