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

Commit bb5d5f6a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: null check validation of a pointer at right place"

parents e9fe92ce 4f76c928

drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_io_util.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -475,16 +475,13 @@ int msm_camera_config_single_vreg(struct device *dev, 
{

{

	int rc = 0;

	int rc = 0;

	if (config) {

	if (config) {

		CDBG("%s enable %s\n", __func__, cam_vreg->reg_name);

		if (!dev || !cam_vreg || !reg_ptr) {



		if (dev == NULL || cam_vreg == NULL ||

			reg_ptr == NULL || *reg_ptr == NULL) {

			pr_err("%s: get failed NULL parameter\n", __func__);

			pr_err("%s: get failed NULL parameter\n", __func__);

			goto vreg_get_fail;

			goto vreg_get_fail;

		}

		}



		CDBG("%s enable %s\n", __func__, cam_vreg->reg_name);

		*reg_ptr = regulator_get(dev, cam_vreg->reg_name);

		*reg_ptr = regulator_get(dev, cam_vreg->reg_name);

		if (IS_ERR(*reg_ptr)) {

		if (IS_ERR_OR_NULL(*reg_ptr)) {

			pr_err("%s: %s get failed\n", __func__,

			pr_err("%s: %s get failed\n", __func__,

				cam_vreg->reg_name);

				cam_vreg->reg_name);

			*reg_ptr = NULL;

			*reg_ptr = NULL;