Merge "msm: camera: Fix null pointer exception in regulator disable" (189e8d79) · Commits · e / devices / android_kernel_sony_msm8998

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

+11 −7

Original line number	Diff line number	Diff line
		/* Copyright (c) 2011-2014, The Linux Foundataion. All rights reserved.
		/* Copyright (c) 2011-2014, 2017, The Linux Foundataion. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -556,12 +556,16 @@ int msm_camera_enable_vreg(struct device dev, struct camera_vreg_t cam_vreg,
		continue;
		} else
		j = i;
		if (reg_ptr[j]) {
		regulator_disable(reg_ptr[j]);
		if (cam_vreg[j].delay > 20)
		msleep(cam_vreg[j].delay);
		else if (cam_vreg[j].delay)
		usleep_range(cam_vreg[j].delay * 1000,
		(cam_vreg[j].delay * 1000) + 1000);
		usleep_range(
		cam_vreg[j].delay * 1000,
		(cam_vreg[j].delay * 1000)
		+ 1000);
		}
		}
		}
		return rc;