mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-10 14:19:09 -04:00
Merge "msm: camera: icp: Fix potential deadlock scenario in cam_hfi_init" into camera-kernel.lnx.4.0
This commit is contained in:
commit
2a7b0a0cbf
1 changed files with 2 additions and 1 deletions
|
|
@ -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));
|
||||
|
|
|
|||
Loading…
Reference in a new issue