tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'fix/misc' into for-linus

* fix/misc:
ALSA: Kill truncate warning by shortening Sigmatel-specific AC97 control name
ALSA: pcsp - fix printk format warning again

Takashi Iwai 4986cab5 89b7161c

+7 -4
unified split
+1 -1
sound/drivers/pcsp/pcsp_mixer.c
··· 51 51 if (uinfo->value.enumerated.item > chip->max_treble) 52 52 uinfo->value.enumerated.item = chip->max_treble; 53 53 sprintf(uinfo->value.enumerated.name, "%lu", 54 - PCSP_CALC_RATE(uinfo->value.enumerated.item)); 54 + (unsigned long)PCSP_CALC_RATE(uinfo->value.enumerated.item)); 55 55 return 0; 56 56 } 57 57
+5 -2
sound/pci/ac97/ac97_patch.c
··· 958 958 } 959 959 960 960 static const struct snd_kcontrol_new snd_ac97_sigmatel_4speaker = 961 - AC97_SINGLE("Sigmatel 4-Speaker Stereo Playback Switch", AC97_SIGMATEL_DAC2INVERT, 2, 1, 0); 961 + AC97_SINGLE("Sigmatel 4-Speaker Stereo Playback Switch", 962 + AC97_SIGMATEL_DAC2INVERT, 2, 1, 0); 962 963 964 + /* "Sigmatel " removed due to excessive name length: */ 963 965 static const struct snd_kcontrol_new snd_ac97_sigmatel_phaseinvert = 964 - AC97_SINGLE("Sigmatel Surround Phase Inversion Playback Switch", AC97_SIGMATEL_DAC2INVERT, 3, 1, 0); 966 + AC97_SINGLE("Surround Phase Inversion Playback Switch", 967 + AC97_SIGMATEL_DAC2INVERT, 3, 1, 0); 965 968 966 969 static const struct snd_kcontrol_new snd_ac97_sigmatel_controls[] = { 967 970 AC97_SINGLE("Sigmatel DAC 6dB Attenuate", AC97_SIGMATEL_ANALOG, 1, 1, 0),
+1 -1
sound/pci/ca0106/ca0106_mixer.c
··· 800 800 "Capture Volume", 801 801 "External Amplifier", 802 802 "Sigmatel 4-Speaker Stereo Playback Switch", 803 - "Sigmatel Surround Phase Inversion Playback ", 803 + "Surround Phase Inversion Playback Switch", 804 804 NULL 805 805 }; 806 806 static char *ca0106_rename_ctls[] = {