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

Commit c22e2d9e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: fix error handling during hardware overload error"

parents 1f60fe1d bafa308f

drivers/media/platform/msm/vidc/msm_vidc_common.c

+1 −1
Original line number Diff line number Diff line
@@ -1885,7 +1885,7 @@ static int msm_comm_session_abort(struct msm_vidc_inst *inst) 
	} else {

		rc = 0;

	}



	msm_comm_session_clean(inst);

	return rc;

}

drivers/media/platform/msm/vidc/venus_hfi.c

+7 −1
Original line number Diff line number Diff line
@@ -2743,8 +2743,14 @@ static int venus_hfi_session_end(void *session) 
		HFI_CMD_SYS_SESSION_END);

}



static int venus_hfi_session_abort(void *session)

static int venus_hfi_session_abort(void *sess)

{

	struct hal_session *session;

	session = sess;

	if (!session || !session->device) {

		dprintk(VIDC_ERR, "Invalid Params\n");

		return -EINVAL;

	}

	venus_hfi_flush_debug_queue(

		((struct hal_session *)session)->device, NULL);

	return venus_hfi_send_session_cmd(session,