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

Commit c9a8d896 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

[media] media: soc-camera: use managed devm_regulator_bulk_get() 



Using device-managed devm_regulator_bulk_get() eliminates the need to
release regulators explicitly.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 05efa71b

drivers/media/platform/soc_camera/soc_camera.c

+2 −5
Original line number Diff line number Diff line
@@ -1139,7 +1139,7 @@ static int soc_camera_probe(struct soc_camera_device *icd) 
	if (ret < 0)

		return ret;



	ret = regulator_bulk_get(icd->pdev, icl->num_regulators,

	ret = devm_regulator_bulk_get(icd->pdev, icl->num_regulators,

				      icl->regulators);

	if (ret < 0)

		goto ereg;
@@ -1244,7 +1244,6 @@ eadddev: 
evdc:

	ici->ops->remove(icd);

eadd:

	regulator_bulk_free(icl->num_regulators, icl->regulators);

ereg:

	v4l2_ctrl_handler_free(&icd->ctrl_handler);

	return ret;
@@ -1278,8 +1277,6 @@ static int soc_camera_remove(struct soc_camera_device *icd) 
	}

	soc_camera_free_user_formats(icd);



	regulator_bulk_free(icl->num_regulators, icl->regulators);



	return 0;

}