From 6c9e82acbbd7a66e16795d9c37a83950859fc7f1 Mon Sep 17 00:00:00 2001 From: "Lad, Prabhakar" Date: Thu, 3 Jan 2013 10:09:19 -0300 Subject: [PATCH] --- yaml --- r: 357379 b: refs/heads/master c: d41d81983a9eb44626ab3ddd1f0184e4815f5bcc h: refs/heads/master i: 357377: ee6c0b2e3b4c29105d6af1ec207b5a3ddf2179d2 357375: 4065b16c421f96fed0030935d69347ecc575fb21 v: v3 --- [refs] | 2 +- trunk/drivers/media/i2c/ths7303.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a5b4c067e1ba..298c9decabf1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4c13d3df1dfabac3d7737924a0dec665a971484 +refs/heads/master: d41d81983a9eb44626ab3ddd1f0184e4815f5bcc diff --git a/trunk/drivers/media/i2c/ths7303.c b/trunk/drivers/media/i2c/ths7303.c index c31cc04fffd2..e747524ba6ed 100644 --- a/trunk/drivers/media/i2c/ths7303.c +++ b/trunk/drivers/media/i2c/ths7303.c @@ -175,7 +175,7 @@ static int ths7303_probe(struct i2c_client *client, v4l_info(client, "chip found @ 0x%x (%s)\n", client->addr << 1, client->adapter->name); - sd = kzalloc(sizeof(struct v4l2_subdev), GFP_KERNEL); + sd = devm_kzalloc(&client->dev, sizeof(struct v4l2_subdev), GFP_KERNEL); if (sd == NULL) return -ENOMEM; @@ -189,7 +189,6 @@ static int ths7303_remove(struct i2c_client *client) struct v4l2_subdev *sd = i2c_get_clientdata(client); v4l2_device_unregister_subdev(sd); - kfree(sd); return 0; }