diff options
author | Antti Palosaari <crope@iki.fi> | 2014-12-06 13:13:31 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-01-29 15:49:25 -0500 |
commit | e7f3f9f36235ca604c336c424709a6ecdd39ce8f (patch) | |
tree | f15c92629c6e7601316ce4fb2633e39bfce04273 /drivers/media/tuners | |
parent | c12922338cb9d1f06cf0951ad3ee692f7d3d96f9 (diff) |
[media] si2157: add own goto label for kfree() on probe error
Use own goto label for error case mem free is needed, even kfree could
be called with NULL. I think it is better to have it, even not required.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/tuners')
-rw-r--r-- | drivers/media/tuners/si2157.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c index 211d500a74dd..3f9aa7ae1613 100644 --- a/drivers/media/tuners/si2157.c +++ b/drivers/media/tuners/si2157.c | |||
@@ -353,7 +353,7 @@ static int si2157_probe(struct i2c_client *client, | |||
353 | cmd.rlen = 1; | 353 | cmd.rlen = 1; |
354 | ret = si2157_cmd_execute(client, &cmd); | 354 | ret = si2157_cmd_execute(client, &cmd); |
355 | if (ret) | 355 | if (ret) |
356 | goto err; | 356 | goto err_kfree; |
357 | 357 | ||
358 | memcpy(&fe->ops.tuner_ops, &si2157_ops, sizeof(struct dvb_tuner_ops)); | 358 | memcpy(&fe->ops.tuner_ops, &si2157_ops, sizeof(struct dvb_tuner_ops)); |
359 | fe->tuner_priv = client; | 359 | fe->tuner_priv = client; |
@@ -363,9 +363,11 @@ static int si2157_probe(struct i2c_client *client, | |||
363 | "Si2146" : "Si2147/2148/2157/2158"); | 363 | "Si2146" : "Si2147/2148/2157/2158"); |
364 | 364 | ||
365 | return 0; | 365 | return 0; |
366 | |||
367 | err_kfree: | ||
368 | kfree(dev); | ||
366 | err: | 369 | err: |
367 | dev_dbg(&client->dev, "failed=%d\n", ret); | 370 | dev_dbg(&client->dev, "failed=%d\n", ret); |
368 | kfree(dev); | ||
369 | return ret; | 371 | return ret; |
370 | } | 372 | } |
371 | 373 | ||