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

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

Merge "asoc: fix routing error during switch from non-adm to adm path"

parents e5b3489f 3d8cc2ed

asoc/msm-pcm-routing-v2.c

+314 −321

File changed.

Preview size limit exceeded, changes collapsed.

asoc/msm-pcm-routing-v2.h

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,6 @@ struct msm_pcm_routing_bdai_data { 
	unsigned int  channel;

	unsigned int  format;

	unsigned int  adm_override_ch;

	u32 passthr_mode[MSM_FRONTEND_DAI_MAX];

	char *name;

};
@@ -532,6 +531,7 @@ struct msm_pcm_routing_fdai_data { 
	int strm_id; /* ASM stream ID */

	int perf_mode;

	struct msm_pcm_routing_evt event_info;

	u32 passthr_mode;

};



#define MAX_APP_TYPES	16