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

Commit c914ebae authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Return error in case of secure scm call failure" into dev/msm-4.14-camx

parents cd6dfe4e adb17b68

drivers/media/platform/msm/camera/cam_sensor_module/cam_csiphy/cam_csiphy_core.c

+3 −1
Original line number Diff line number Diff line
@@ -819,9 +819,11 @@ int32_t cam_csiphy_core_cfg(void *phy_dev, 
			rc = cam_csiphy_notify_secure_mode(

				csiphy_dev,

				CAM_SECURE_MODE_SECURE, offset);

			if (rc < 0)

			if (rc < 0) {

				csiphy_dev->csiphy_info.secure_mode[offset] =

					CAM_SECURE_MODE_NON_SECURE;

				goto release_mutex;

			}

		}



		rc = cam_csiphy_enable_hw(csiphy_dev);