Skip to content

Commit 75ca0b0

Browse files
committed
ASoC: wm_adsp: Remove memory region char from ALSA control names for V3
From v3 the alsa control name shouldn't specify the memory region name for DSP controls, as control names should already be unique for the firmware. This was originally removed in 1fb5399 but accidentally added back. Change-Id: Ief33df7968c55755a0598318a924d78bfdea6d41 Signed-off-by: Stuart Henderson <[email protected]>
1 parent d9f6f5d commit 75ca0b0

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

sound/soc/codecs/wm_adsp.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1613,11 +1613,16 @@ static int wm_adsp_create_control(struct wm_adsp *dsp,
16131613
dsp->name, region_name, alg_region->alg);
16141614
subname = NULL; /* don't append subname */
16151615
break;
1616-
default:
1616+
case 2:
16171617
ret = snprintf(name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN,
16181618
"%s%c %.12s %x", dsp->name, *region_name,
16191619
fw_txt, alg_region->alg);
16201620
break;
1621+
default:
1622+
ret = snprintf(name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN,
1623+
"%s %.12s %x", dsp->name,
1624+
fw_txt, alg_region->alg);
1625+
break;
16211626
}
16221627

16231628
if (subname) {

0 commit comments

Comments
 (0)