Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc9c94cd authored by Sachin Kamat's avatar Sachin Kamat Committed by Mauro Carvalho Chehab
Browse files

[media] s5k6aa: Use devm_kzalloc function 



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

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Acked-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b08deebe

drivers/media/video/s5k6aa.c

+2 −5
Original line number Diff line number Diff line
@@ -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;

}