diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-08 11:18:57 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-08 11:18:57 -0800 |
| commit | 33938e1252fa2924aff76bf963248444560e7292 (patch) | |
| tree | 729ed61d0452f34b3932827a87cad94e812a1395 /drivers | |
| parent | 74f298e6d1ed9a47b167609396525fbe0be44f4c (diff) | |
| parent | ad35a18f28177dc3aed3bab495f3df9d41d8279d (diff) | |
Merge "msm: soc: Avoid calling bus clear pdata"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/common/cam_soc_api.c | 7 |
1 files changed, 5 insertions, 2 deletions
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; } |