From ad052d501abfa95c97f1f4b11876a1df8cfa036e Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Thu, 26 Jul 2012 02:23:32 -0300 Subject: [PATCH] --- yaml --- r: 330831 b: refs/heads/master c: dc9c94cd339dc74b73ca7ef0943ea610d02f8e3e h: refs/heads/master i: 330829: 3a86637eccd5fd10069ee409e9a6fe58453b0184 330827: 915419e253c402ea9fcf269653339a30ffe14f73 330823: 9fd3c46108608fe388d3e2a9504da2f69727c929 330815: 7f194e711e9cf2cdbe9315eafdae8cf9af12b1ee v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s5k6aa.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a3d3f439b3ea..4576ad9d098b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b08deebebe13c73b35701d180a4689dfb34db519 +refs/heads/master: dc9c94cd339dc74b73ca7ef0943ea610d02f8e3e diff --git a/trunk/drivers/media/video/s5k6aa.c b/trunk/drivers/media/video/s5k6aa.c index decb64808346..045ca7f4f6ca 100644 --- a/trunk/drivers/media/video/s5k6aa.c +++ b/trunk/drivers/media/video/s5k6aa.c @@ -1568,7 +1568,7 @@ static int s5k6aa_probe(struct i2c_client *client, return -EINVAL; } - s5k6aa = kzalloc(sizeof(*s5k6aa), GFP_KERNEL); + s5k6aa = devm_kzalloc(&client->dev, sizeof(*s5k6aa), GFP_KERNEL); if (!s5k6aa) return -ENOMEM; @@ -1592,7 +1592,7 @@ static int s5k6aa_probe(struct i2c_client *client, sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV_SENSOR; ret = media_entity_init(&sd->entity, 1, &s5k6aa->pad, 0); if (ret) - goto out_err1; + return ret; ret = s5k6aa_configure_gpios(s5k6aa, pdata); if (ret) @@ -1627,8 +1627,6 @@ static int s5k6aa_probe(struct i2c_client *client, s5k6aa_free_gpios(s5k6aa); out_err2: media_entity_cleanup(&s5k6aa->sd.entity); -out_err1: - kfree(s5k6aa); return ret; } @@ -1642,7 +1640,6 @@ static int s5k6aa_remove(struct i2c_client *client) media_entity_cleanup(&sd->entity); regulator_bulk_free(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); s5k6aa_free_gpios(s5k6aa); - kfree(s5k6aa); return 0; }