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

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

Merge "asoc: avoid excessive logging"

parents cd01483c f74e89bd

asoc/msm-compress-q6-v2.c

+1 −3
Original line number Diff line number Diff line
@@ -2788,12 +2788,10 @@ static int msm_compr_pointer(struct snd_compr_stream *cstream, 
				rc = q6asm_get_session_time(

				prtd->audio_client, &prtd->marker_timestamp);

			if (rc < 0) {

				pr_err("%s: Get Session Time return =%lld\n",

					__func__, timestamp);

				if (atomic_read(&prtd->error))

					return -ENETRESET;

				else

					return -EAGAIN;

					return rc;

			}

		}

	} else {

dsp/q6asm.c

+5 −4
Original line number Diff line number Diff line
@@ -9644,10 +9644,11 @@ int q6asm_get_session_time(struct audio_client *ac, uint64_t *tstamp) 
		 ac->session, mtmx_params.hdr.opcode);

	rc = apr_send_pkt(ac->apr, (uint32_t *) &mtmx_params);

	if (rc < 0) {

		pr_err("%s: Commmand 0x%x failed %d\n", __func__,

		       mtmx_params.hdr.opcode, rc);

		goto fail_cmd;

		dev_err_ratelimited(ac->dev, "%s: Get Session Time failed %d\n",

				    __func__, rc);

		return rc;

	}



	rc = wait_event_timeout(ac->time_wait,

			(atomic_read(&ac->time_flag) == 0),

			msecs_to_jiffies(TIMEOUT_MS));