From e7f3f9f36235ca604c336c424709a6ecdd39ce8f Mon Sep 17 00:00:00 2001 From: Antti Palosaari Date: Sat, 6 Dec 2014 15:13:31 -0300 Subject: [PATCH] [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 Signed-off-by: Mauro Carvalho Chehab --- drivers/media/tuners/si2157.c | 6 ++++-- 1 file 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, cmd.rlen = 1; ret = si2157_cmd_execute(client, &cmd); if (ret) - goto err; + goto err_kfree; memcpy(&fe->ops.tuner_ops, &si2157_ops, sizeof(struct dvb_tuner_ops)); fe->tuner_priv = client; @@ -363,9 +363,11 @@ static int si2157_probe(struct i2c_client *client, "Si2146" : "Si2147/2148/2157/2158"); return 0; + +err_kfree: + kfree(dev); err: dev_dbg(&client->dev, "failed=%d\n", ret); - kfree(dev); return ret; } -- 2.39.5