From 14df04cea9735bbedb2bbf0ad942fb384215d25c Mon Sep 17 00:00:00 2001 From: "Lad, Prabhakar" Date: Thu, 3 Jan 2013 10:04:57 -0300 Subject: [PATCH] --- yaml --- r: 357381 b: refs/heads/master c: 08754d3185fb7a95b24ae2a5e143f457f556da77 h: refs/heads/master i: 357379: 6c9e82acbbd7a66e16795d9c37a83950859fc7f1 v: v3 --- [refs] | 2 +- trunk/drivers/media/i2c/tvp514x.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3fb5c05ee344..156cb4f65ce6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3e8e4f1c039b13644f06c74cc5507bebc41da69 +refs/heads/master: 08754d3185fb7a95b24ae2a5e143f457f556da77 diff --git a/trunk/drivers/media/i2c/tvp514x.c b/trunk/drivers/media/i2c/tvp514x.c index d5e10215a28f..aa94ebc2d755 100644 --- a/trunk/drivers/media/i2c/tvp514x.c +++ b/trunk/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; @@ -998,7 +998,6 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id) int err = decoder->hdl.error; v4l2_ctrl_handler_free(&decoder->hdl); - kfree(decoder); return err; } v4l2_ctrl_handler_setup(&decoder->hdl); @@ -1023,7 +1022,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 */