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

Commit 2a09db80 authored by Vijay kumar Tumati's avatar Vijay kumar Tumati Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera: Check if regulator is null before enabling 



Using IS_ERR_OR_NULL instead of IS_ERR to also check for
null pointer.

Change-Id: If53a07db52a4d091693a49f9d084df7d4fbf257a
Signed-off-by: default avatarVijay kumar Tumati <vtumati@codeaurora.org>
parent 2e92d13a

drivers/media/platform/msm/camera_v2/common/msm_camera_io_util.c

+2 −2
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ int msm_camera_config_vreg(struct device *dev, struct camera_vreg_t *cam_vreg, 
			curr_vreg = &cam_vreg[j];

			reg_ptr[j] = regulator_get(dev,

				curr_vreg->reg_name);

			if (IS_ERR(reg_ptr[j])) {

			if (IS_ERR_OR_NULL(reg_ptr[j])) {

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

					 __func__,

					 curr_vreg->reg_name);
@@ -531,7 +531,7 @@ int msm_camera_enable_vreg(struct device *dev, struct camera_vreg_t *cam_vreg, 
					continue;

			} else

				j = i;

			if (IS_ERR(reg_ptr[j])) {

			if (IS_ERR_OR_NULL(reg_ptr[j])) {

				pr_err("%s: %s null regulator\n",

					__func__, cam_vreg[j].reg_name);

				goto disable_vreg;