From ad35a18f28177dc3aed3bab495f3df9d41d8279d Mon Sep 17 00:00:00 2001 From: Krishnankutty Kolathappilly Date: Wed, 12 Oct 2016 19:27:13 -0700 Subject: msm: soc: Avoid calling bus clear pdata Avoid calling bus clear pdata when bus manager is de-initialized as this is a redundant call. This is taken care by the base device driver release_node function. CRs-Fixed: 1076959 Change-Id: I8de2db02e6e073144bc5d8a9173313102c9a598f Signed-off-by: Krishnankutty Kolathappilly --- drivers/media/platform/msm/camera_v2/common/cam_soc_api.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/media/platform/msm/camera_v2/common/cam_soc_api.c b/drivers/media/platform/msm/camera_v2/common/cam_soc_api.c index d6bb18522e0c..033ff7bcfca5 100644 --- a/drivers/media/platform/msm/camera_v2/common/cam_soc_api.c +++ b/drivers/media/platform/msm/camera_v2/common/cam_soc_api.c @@ -1040,8 +1040,11 @@ uint32_t msm_camera_unregister_bus_client(enum cam_bus_client id) mutex_destroy(&g_cv[id].lock); msm_bus_scale_unregister_client(g_cv[id].bus_client); - msm_bus_cl_clear_pdata(g_cv[id].pdata); - memset(&g_cv[id], 0, sizeof(struct msm_cam_bus_pscale_data)); + g_cv[id].bus_client = 0; + g_cv[id].num_usecases = 0; + g_cv[id].num_paths = 0; + g_cv[id].vector_index = 0; + g_cv[id].dyn_vote = 0; return 0; } -- cgit v1.2.3