From cc91d2123b8b9f6f00f0bb47b5eee444d70e4571 Mon Sep 17 00:00:00 2001 From: "Lad, Prabhakar" Date: Thu, 3 Jan 2013 10:08:46 -0300 Subject: [PATCH] --- yaml --- r: 357382 b: refs/heads/master c: c7a857a09f1f00e6cb04c6565c136a9f0018532d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/i2c/adv7343.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 156cb4f65ce6..bafe84036a02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08754d3185fb7a95b24ae2a5e143f457f556da77 +refs/heads/master: c7a857a09f1f00e6cb04c6565c136a9f0018532d diff --git a/trunk/drivers/media/i2c/adv7343.c b/trunk/drivers/media/i2c/adv7343.c index 2b5aa676a84e..432eb5f7a0e5 100644 --- a/trunk/drivers/media/i2c/adv7343.c +++ b/trunk/drivers/media/i2c/adv7343.c @@ -397,7 +397,8 @@ static int adv7343_probe(struct i2c_client *client, v4l_info(client, "chip found @ 0x%x (%s)\n", client->addr << 1, client->adapter->name); - state = kzalloc(sizeof(struct adv7343_state), GFP_KERNEL); + state = devm_kzalloc(&client->dev, sizeof(struct adv7343_state), + GFP_KERNEL); if (state == NULL) return -ENOMEM; @@ -431,16 +432,13 @@ static int adv7343_probe(struct i2c_client *client, int err = state->hdl.error; v4l2_ctrl_handler_free(&state->hdl); - kfree(state); return err; } v4l2_ctrl_handler_setup(&state->hdl); err = adv7343_initialize(&state->sd); - if (err) { + if (err) v4l2_ctrl_handler_free(&state->hdl); - kfree(state); - } return err; } @@ -451,7 +449,6 @@ static int adv7343_remove(struct i2c_client *client) v4l2_device_unregister_subdev(sd); v4l2_ctrl_handler_free(&state->hdl); - kfree(state); return 0; }