A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 10:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: camera: reqmgr: Avoid freeing subdev twice" into camera-kernel.lnx.4.0

Browse source
This commit is contained in:
Camera Software Integration 2022-03-22 06:21:19 -07:00 • committed by Gerrit - the friendly Code Review server
commit a9d8ab272a
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/cam_req_mgr/cam_req_mgr_core.c
View file

@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <linux/module.h>
@ -2281,10 +2282,13 @@ static int __cam_req_mgr_create_subdevs(
*
*/
static void __cam_req_mgr_destroy_subdev(
struct cam_req_mgr_connected_device *l_device)
struct cam_req_mgr_connected_device **l_device)
{
kfree(l_device);
l_device = NULL;
CAM_DBG(CAM_CRM, "*l_device %pK", *l_device);
if (*(l_device) != NULL) {
kfree(*(l_device));
*l_device = NULL;
}
}
/**
@ -3826,7 +3830,7 @@ static int __cam_req_mgr_unlink(
__cam_req_mgr_destroy_link_info(link);
/* Free memory holding data of linked devs */
__cam_req_mgr_destroy_subdev(link->l_dev);
__cam_req_mgr_destroy_subdev(&link->l_dev);
/* Destroy the link handle */
rc = cam_destroy_device_hdl(link->link_hdl);
@ -4002,7 +4006,7 @@ int cam_req_mgr_link(struct cam_req_mgr_ver_info *link_info)
mutex_unlock(&g_crm_core_dev->crm_lock);
return rc;
setup_failed:
__cam_req_mgr_destroy_subdev(link->l_dev);
__cam_req_mgr_destroy_subdev(&link->l_dev);
create_subdev_failed:
cam_destroy_device_hdl(link->link_hdl);
link_info->u.link_info_v1.link_hdl = -1;
@ -4118,7 +4122,7 @@ int cam_req_mgr_link_v2(struct cam_req_mgr_ver_info *link_info)
mutex_unlock(&g_crm_core_dev->crm_lock);
return rc;
setup_failed:
__cam_req_mgr_destroy_subdev(link->l_dev);
__cam_req_mgr_destroy_subdev(&link->l_dev);
create_subdev_failed:
cam_destroy_device_hdl(link->link_hdl);
link_info->u.link_info_v2.link_hdl = -1;