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

Commit 72a6dbbd authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge " msm: camera: jpeg: Correct halt sequence for jpeg core"

parents 7d31e0c3 b6d22efe

drivers/media/platform/msm/camera/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c

+11 −0
Original line number Diff line number Diff line
@@ -927,6 +927,17 @@ static void cam_jpeg_mgr_stop_deinit_dev(struct cam_jpeg_hw_mgr *hw_mgr, 
		CAM_ERR(CAM_JPEG, "op stop null %d", dev_type);

	}



	if (hw_mgr->devices[dev_type][0]->hw_ops.reset) {

		rc = hw_mgr->devices[dev_type][0]->hw_ops.reset(

			hw_mgr->devices[dev_type][0]->hw_priv,

			NULL, 0);

		if (rc)

			CAM_ERR(CAM_JPEG, "jpeg hw reset failed %d:%d",

				dev_type, rc);

	} else {

		CAM_ERR(CAM_JPEG, "op hw reset null %d", dev_type);

	}



	if (hw_mgr->devices[dev_type][0]->hw_ops.deinit) {

		rc = hw_mgr->devices[dev_type][0]->hw_ops.deinit(

			hw_mgr->devices[dev_type][0]->hw_priv,