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

Commit 2a7b0a0c authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: icp: Fix potential deadlock scenario in cam_hfi_init" into... 

Merge "msm: camera: icp: Fix potential deadlock scenario in cam_hfi_init" into camera-kernel.lnx.4.0
parents 6f7f5948 033864b0

drivers/cam_icp/hfi.c

+2 −1
Original line number Diff line number Diff line
@@ -647,7 +647,8 @@ int cam_hfi_init(struct hfi_mem_info *hfi_mem, const struct hfi_ops *hfi_ops, 


	if (g_hfi->hfi_state != HFI_DEINIT) {

		CAM_ERR(CAM_HFI, "hfi_init: invalid state");

		return -EINVAL;

		rc = -EINVAL;

		goto regions_fail;

	}



	memcpy(&g_hfi->map, hfi_mem, sizeof(g_hfi->map));