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

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

Merge "msm: sensor: Fix for variable being de-referenced without proper check"

parents 6c18a826 6467925a

drivers/media/platform/msm/ais/sensor/flash/msm_flash.c

+5 −5
Original line number Diff line number Diff line
@@ -1022,13 +1022,13 @@ static long msm_flash_subdev_do_ioctl( 
	sd = vdev_to_v4l2_subdev(vdev);

	u32 = (struct msm_flash_cfg_data_t32 *)arg;



	switch (cmd) {

	case VIDIOC_MSM_FLASH_CFG32:

		flash_data.cfg_type = u32->cfg_type;

		for (i = 0; i < MAX_LED_TRIGGERS; i++) {

			flash_data.flash_current[i] = u32->flash_current[i];

			flash_data.flash_duration[i] = u32->flash_duration[i];

		}

	switch (cmd) {

	case VIDIOC_MSM_FLASH_CFG32:

		cmd = VIDIOC_MSM_FLASH_CFG;

		switch (flash_data.cfg_type) {

		case CFG_FLASH_OFF:

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

+1 −2
Original line number Diff line number Diff line
@@ -781,11 +781,10 @@ static long msm_ois_subdev_do_ioctl( 
	u32 = (struct msm_ois_cfg_data32 *)arg;

	parg = arg;



	ois_data.cfgtype = u32->cfgtype;



	switch (cmd) {

	case VIDIOC_MSM_OIS_CFG32:

		cmd = VIDIOC_MSM_OIS_CFG;

		ois_data.cfgtype = u32->cfgtype;



		switch (u32->cfgtype) {

		case CFG_OIS_CONTROL: