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

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

Merge "msm: camera: core: release ref after config failed" into dev/msm-4.14-camx

parents 42c58cdb eb7b2f9c

drivers/media/platform/msm/camera/cam_core/cam_context_utils.c

+4 −3
Original line number Diff line number Diff line
@@ -480,8 +480,7 @@ int32_t cam_context_prepare_dev_to_hw(struct cam_context *ctx, 
						ctx->dev_name, ctx->ctx_id,

						req->request_id);



				cam_context_putref(ctx);

				goto put_ref;

				goto put_ctx_ref;

			}

			CAM_DBG(CAM_CTXT, "register in fence cb: %d ret = %d",

				req->in_map_entries[j].sync_id, rc);
@@ -493,7 +492,9 @@ int32_t cam_context_prepare_dev_to_hw(struct cam_context *ctx, 
			ctx->dev_name, ctx->ctx_id);



	return rc;



put_ctx_ref:

	for (j; j >= 0; j--)

		cam_context_putref(ctx);

put_ref:

	for (--i; i >= 0; i--) {

		if (cam_sync_put_obj_ref(req->out_map_entries[i].sync_id))