Merge "msm: camera: icp: Fix potential deadlock scenario in cam_hfi_init" into camera-kernel.lnx.4.0

This commit is contained in:
Camera Software Integration
2020-09-28 13:19:14 -07:00
committed by Gerrit - the friendly Code Review server

View File

@@ -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));