Merge "msm: sensor: Fix for variable being de-referenced without proper check" (77c2b121) · Commits · e / devices / android_kernel_sony_msm8998

drivers/media/platform/msm/ais/sensor/ois/msm_ois.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -781,6 +781,7 @@ static long msm_ois_subdev_do_ioctl(
		u32 = (struct msm_ois_cfg_data32 *)arg;
		parg = arg;


		switch (cmd) {
		case VIDIOC_MSM_OIS_CFG32:
		cmd = VIDIOC_MSM_OIS_CFG;
		@@ -818,7 +819,6 @@ static long msm_ois_subdev_do_ioctl(
		settings.reg_setting =
		compat_ptr(settings32.reg_setting);

		ois_data.cfgtype = u32->cfgtype;
		ois_data.cfg.settings = &settings;
		parg = &ois_data;
		break;