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

Commit c7ad6bde authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Correct secure mode use case"

parents 79baead7 7d37ff2c

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+8 −3
Original line number Original line Diff line number Diff line
@@ -1337,10 +1337,15 @@ static int cam_ife_mgr_acquire_cid_res( 
			if (!cid_res_iterator->hw_res[i])

			if (!cid_res_iterator->hw_res[i])

				continue;

				continue;





			if (cid_res_iterator->is_secure == 1 ||

			if (in_port->num_out_res &&

				((cid_res_iterator->is_secure == 1 &&

				out_port->secure_mode == 0) ||

				(cid_res_iterator->is_secure == 0 &&

				(cid_res_iterator->is_secure == 0 &&

				in_port->num_out_res &&

				out_port->secure_mode == 1)))

				out_port->secure_mode == 1))

				continue;



			if (!in_port->num_out_res &&

				cid_res_iterator->is_secure == 1)

				continue;

				continue;





			hw_intf = cid_res_iterator->hw_res[i]->hw_intf;

			hw_intf = cid_res_iterator->hw_res[i]->hw_intf;