UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] s5k6aa: Use devm_kzalloc function 

devm_kzalloc() eliminates the need to free explicitly thereby
making the code a bit simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Sachin Kamat 2012-07-26 02:23:32 -03:00 committed by Mauro Carvalho Chehab
parent b08deebebe
commit dc9c94cd33
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/video/s5k6aa.c
View File

@ -1568,7 +1568,7 @@ static int s5k6aa_probe(struct i2c_client *client,
return -EINVAL; return -EINVAL;
} }
s5k6aa = kzalloc(sizeof(*s5k6aa), GFP_KERNEL); s5k6aa = devm_kzalloc(&client->dev, sizeof(*s5k6aa), GFP_KERNEL);
if (!s5k6aa) if (!s5k6aa)
return -ENOMEM; return -ENOMEM;
@ -1592,7 +1592,7 @@ static int s5k6aa_probe(struct i2c_client *client,
sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV_SENSOR; sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV_SENSOR;
ret = media_entity_init(&sd->entity, 1, &s5k6aa->pad, 0); ret = media_entity_init(&sd->entity, 1, &s5k6aa->pad, 0);
if (ret) if (ret)
goto out_err1; return ret;
ret = s5k6aa_configure_gpios(s5k6aa, pdata); ret = s5k6aa_configure_gpios(s5k6aa, pdata);
if (ret) if (ret)
@ -1627,8 +1627,6 @@ out_err3:
s5k6aa_free_gpios(s5k6aa); s5k6aa_free_gpios(s5k6aa);
out_err2: out_err2:
media_entity_cleanup(&s5k6aa->sd.entity); media_entity_cleanup(&s5k6aa->sd.entity);
out_err1:
kfree(s5k6aa);
return ret; return ret;
} }
@ -1642,7 +1640,6 @@ static int s5k6aa_remove(struct i2c_client *client)
media_entity_cleanup(&sd->entity); media_entity_cleanup(&sd->entity);
regulator_bulk_free(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies); regulator_bulk_free(S5K6AA_NUM_SUPPLIES, s5k6aa->supplies);
s5k6aa_free_gpios(s5k6aa); s5k6aa_free_gpios(s5k6aa);
kfree(s5k6aa);
return 0; return 0;
} }