Merge "ASoC: msm: qdsp6v2: primary plus 8 interactive stream playback fix" (b2c8ebb4) · Commits · e / devices / android_kernel_sony_msm8998

sound/soc/msm/qdsp6v2/q6asm.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@

		#define TRUE 0x01
		#define FALSE 0x00
		#define SESSION_MAX 8
		#define SESSION_MAX 9
		#define ASM_MAX_CHANNELS 8
		enum {
		ASM_TOPOLOGY_CAL = 0,
		@@ -1338,7 +1338,7 @@ int q6asm_audio_client_buf_alloc(unsigned int dir,
		pr_debug("%s: session[%d]bufsz[%d]bufcnt[%d]\n", __func__, ac->session,
		bufsz, bufcnt);

		if (ac->session <= 0 \|\| ac->session > 8) {
		if (ac->session <= 0 \|\| ac->session > ASM_ACTIVE_STREAMS_ALLOWED) {
		pr_err("%s: Session ID is invalid, session = %d\n", __func__,
		ac->session);
		goto fail;
		@@ -1429,7 +1429,7 @@ int q6asm_audio_client_buf_alloc_contiguous(unsigned int dir,
		__func__, ac->session,
		bufsz, bufcnt);

		if (ac->session <= 0 \|\| ac->session > 8) {
		if (ac->session <= 0 \|\| ac->session > ASM_ACTIVE_STREAMS_ALLOWED) {
		pr_err("%s: Session ID is invalid, session = %d\n", __func__,
		ac->session);
		goto fail;
		@@ -1738,7 +1738,7 @@ static int32_t q6asm_callback(struct apr_client_data data, void priv)
		return -EINVAL;
		}

		if (ac->session <= 0 \|\| ac->session > 8) {
		if (ac->session <= 0 \|\| ac->session > ASM_ACTIVE_STREAMS_ALLOWED) {
		pr_err("%s: Session ID is invalid, session = %d\n", __func__,
		ac->session);
		return -EINVAL;