linuxmsm/laptops-kernel
0
0
Fork 0
mirror of https://github.com/linux-msm/laptops-kernel.git synced 2026-08-13 14:19:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: ctxfi: Use correct DAIO type for da_desc

Browse Source 
Skip the unused DAIO type per model (SPDIFIO on CTSB073X, SPDIFI_BAY
on all others) and use the correct DAIO type directly as da_desc
type. This removes the mismatch and misleading between the actual
DAIO resource and the da_desc type like SPDIFI_BAY (formerly SPDIFI1).
Update related functions accordingly, and drop the unreachable
SPDIFI_BAY case from the hw20k2 daio_device_index().

Signed-off-by: Harin Lee <me@harin.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20260401090159.2404387-3-me@harin.net
This commit is contained in:
Harin Lee
2026-04-01 14:43:54 +02:00
committed by Takashi Iwai
parent c6cd83ccee
commit 07b116b44e
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sound/pci/ctxfi/ctatc.c
+12 -9
View File
@@ -983,6 +983,11 @@ static int atc_select_mic_in(struct ct_atc *atc)
return 0;
}
static inline enum DAIOTYP atc_spdif_in_type(struct ct_atc *atc)
{
return (atc->model == CTSB073X) ? SPDIFI_BAY : SPDIFIO;
}
static struct capabilities atc_capabilities(struct ct_atc *atc)
{
struct hw *hw = atc->hw;
@@ -1121,7 +1126,7 @@ static int atc_spdif_out_unmute(struct ct_atc *atc, unsigned char state)
static int atc_spdif_in_unmute(struct ct_atc *atc, unsigned char state)
{
return atc_daio_unmute(atc, state, SPDIFIO);
return atc_daio_unmute(atc, state, atc_spdif_in_type(atc));
}
static int atc_spdif_out_get_status(struct ct_atc *atc, unsigned int *status)
@@ -1427,14 +1432,12 @@ static int atc_get_resources(struct ct_atc *atc)
daio_mgr = (struct daio_mgr *)atc->rsc_mgrs[DAIO];
da_desc.msr = atc->msr;
for (i = 0; i < NUM_DAIOTYP; i++) {
if (((i == MIC) && !cap.dedicated_mic) ||
((i == RCA) && !cap.dedicated_rca) ||
i == SPDIFI_BAY)
if (((i == SPDIFIO) && (atc->model == CTSB073X)) ||
((i == SPDIFI_BAY) && (atc->model != CTSB073X)) ||
((i == MIC) && !cap.dedicated_mic) ||
((i == RCA) && !cap.dedicated_rca))
continue;
if (atc->model == CTSB073X && i == SPDIFIO)
da_desc.type = SPDIFI_BAY;
else
da_desc.type = i;
da_desc.type = i;
da_desc.output = (i < LINEIM) || (i == RCA);
err = daio_mgr->get_daio(daio_mgr, &da_desc,
(struct daio **)&atc->daios[i]);
@@ -1569,7 +1572,7 @@ static void atc_connect_resources(struct ct_atc *atc)
mixer->set_input_right(mixer, MIX_MIC_IN, &src->rsc);
}
dai = container_of(atc->daios[SPDIFIO], struct dai, daio);
dai = container_of(atc->daios[atc_spdif_in_type(atc)], struct dai, daio);
atc_connect_dai(atc->rsc_mgrs[SRC], dai,
(struct src **)&atc->srcs[0],
(struct srcimp **)&atc->srcimps[0]);
sound/pci/ctxfi/ctdaio.c
-1
View File
@@ -120,7 +120,6 @@ static int daio_device_index(enum DAIOTYP type, struct hw *hw)
switch (type) {
case SPDIFOO: return 0;
case SPDIFIO: return 0;
case SPDIFI_BAY: return 1;
case LINEO1: return 4;
case LINEO2: return 7;
case LINEO3: return 5;