Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e72f411 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: reqmgr: Remove mem_mgr init & deinit calls" into dev/msm-4.14-camx

parents 8a92c94c 1315990c

drivers/media/platform/msm/camera/cam_req_mgr/cam_req_mgr_dev.c

+0 −9
Original line number Diff line number Diff line
@@ -584,7 +584,6 @@ EXPORT_SYMBOL(cam_unregister_subdev); 
static int cam_req_mgr_remove(struct platform_device *pdev)

{

	cam_req_mgr_core_device_deinit();

	cam_mem_mgr_deinit();

	cam_req_mgr_util_deinit();

	cam_media_device_cleanup();

	cam_video_device_cleanup();
@@ -624,12 +623,6 @@ static int cam_req_mgr_probe(struct platform_device *pdev) 
		goto req_mgr_util_fail;

	}



	rc = cam_mem_mgr_init();

	if (rc) {

		CAM_ERR(CAM_CRM, "mem mgr init failed");

		goto mem_mgr_init_fail;

	}



	rc = cam_req_mgr_core_device_init();

	if (rc) {

		CAM_ERR(CAM_CRM, "core device setup failed");
@@ -654,8 +647,6 @@ static int cam_req_mgr_probe(struct platform_device *pdev) 
	return rc;



req_mgr_core_fail:

	cam_mem_mgr_deinit();

mem_mgr_init_fail:

	cam_req_mgr_util_deinit();

req_mgr_util_fail:

	mutex_destroy(&g_dev.dev_lock);