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

Commit afe6d7e3 authored by Andreas Mohr's avatar Andreas Mohr Committed by Takashi Iwai
Browse files

ALSA: Kill truncate warning by shortening Sigmatel-specific AC97 control name 



ALSA sound/core/control.c:232: Control name 'Sigmatel Surround Phase
Inversion Playback Switch' truncated to 'Sigmatel Surround Phase
Inversion Playback ' bootup message by omitting weird Sigmatel prefix
in this case; also fix up the related ca0106 mixer control removal
part by using identical naming there.

Signed-off-by: default avatarAndreas Mohr <andi@lisas.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b3b778b3

sound/pci/ac97/ac97_patch.c

+5 −2
Original line number Diff line number Diff line
@@ -958,10 +958,13 @@ static int patch_sigmatel_stac9708_3d(struct snd_ac97 * ac97) 
}



static const struct snd_kcontrol_new snd_ac97_sigmatel_4speaker =

AC97_SINGLE("Sigmatel 4-Speaker Stereo Playback Switch", AC97_SIGMATEL_DAC2INVERT, 2, 1, 0);

AC97_SINGLE("Sigmatel 4-Speaker Stereo Playback Switch",

		AC97_SIGMATEL_DAC2INVERT, 2, 1, 0);



/* "Sigmatel " removed due to excessive name length: */

static const struct snd_kcontrol_new snd_ac97_sigmatel_phaseinvert =

AC97_SINGLE("Sigmatel Surround Phase Inversion Playback Switch", AC97_SIGMATEL_DAC2INVERT, 3, 1, 0);

AC97_SINGLE("Surround Phase Inversion Playback Switch",

		AC97_SIGMATEL_DAC2INVERT, 3, 1, 0);



static const struct snd_kcontrol_new snd_ac97_sigmatel_controls[] = {

AC97_SINGLE("Sigmatel DAC 6dB Attenuate", AC97_SIGMATEL_ANALOG, 1, 1, 0),

sound/pci/ca0106/ca0106_mixer.c

+1 −1
Original line number Diff line number Diff line
@@ -800,7 +800,7 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu) 
		"Capture Volume",

		"External Amplifier",

		"Sigmatel 4-Speaker Stereo Playback Switch",

		"Sigmatel Surround Phase Inversion Playback ",

		"Surround Phase Inversion Playback Switch",

		NULL

	};

	static char *ca0106_rename_ctls[] = {