lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <1357219362-9080-3-git-send-email-prabhakar.lad@ti.com> Date: Thu, 3 Jan 2013 18:52:41 +0530 From: "Lad, Prabhakar" <prabhakar.csengg@...il.com> To: LMML <linux-media@...r.kernel.org> Cc: LKML <linux-kernel@...r.kernel.org>, Mauro Carvalho Chehab <mchehab@...radead.org>, DLOS <davinci-linux-open-source@...ux.davincidsp.com>, Hans Verkuil <hans.verkuil@...co.com>, "Lad, Prabhakar" <prabhakar.lad@...com>, Manjunath Hadli <manjunath.hadli@...com> Subject: [PATCH] tvp514x: use devm_kzalloc() instead of kzalloc() I2C drivers can use devm_kzalloc() too in their .probe() methods. Doing so simplifies their clean up paths. Signed-off-by: Lad, Prabhakar <prabhakar.lad@...com> Signed-off-by: Manjunath Hadli <manjunath.hadli@...com> --- drivers/media/i2c/tvp514x.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/media/i2c/tvp514x.c b/drivers/media/i2c/tvp514x.c index d5e1021..53608ee 100644 --- a/drivers/media/i2c/tvp514x.c +++ b/drivers/media/i2c/tvp514x.c @@ -951,7 +951,7 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id) return -ENODEV; } - decoder = kzalloc(sizeof(*decoder), GFP_KERNEL); + decoder = devm_kzalloc(&client->dev, sizeof(*decoder), GFP_KERNEL); if (!decoder) return -ENOMEM; @@ -995,11 +995,8 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id) V4L2_CID_AUTOGAIN, 0, 1, 1, 1); sd->ctrl_handler = &decoder->hdl; if (decoder->hdl.error) { - int err = decoder->hdl.error; - v4l2_ctrl_handler_free(&decoder->hdl); - kfree(decoder); - return err; + return decoder->hdl.error; } v4l2_ctrl_handler_setup(&decoder->hdl); @@ -1023,7 +1020,6 @@ static int tvp514x_remove(struct i2c_client *client) v4l2_device_unregister_subdev(sd); v4l2_ctrl_handler_free(&decoder->hdl); - kfree(decoder); return 0; } /* TVP5146 Init/Power on Sequence */ -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists