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
This commit is contained in:
commit
4986cab555
|
@ -51,7 +51,7 @@ static int pcsp_treble_info(struct snd_kcontrol *kcontrol,
|
||||||
if (uinfo->value.enumerated.item > chip->max_treble)
|
if (uinfo->value.enumerated.item > chip->max_treble)
|
||||||
uinfo->value.enumerated.item = chip->max_treble;
|
uinfo->value.enumerated.item = chip->max_treble;
|
||||||
sprintf(uinfo->value.enumerated.name, "%lu",
|
sprintf(uinfo->value.enumerated.name, "%lu",
|
||||||
PCSP_CALC_RATE(uinfo->value.enumerated.item));
|
(unsigned long)PCSP_CALC_RATE(uinfo->value.enumerated.item));
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -958,10 +958,13 @@ static int patch_sigmatel_stac9708_3d(struct snd_ac97 * ac97)
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct snd_kcontrol_new snd_ac97_sigmatel_4speaker =
|
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 =
|
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[] = {
|
static const struct snd_kcontrol_new snd_ac97_sigmatel_controls[] = {
|
||||||
AC97_SINGLE("Sigmatel DAC 6dB Attenuate", AC97_SIGMATEL_ANALOG, 1, 1, 0),
|
AC97_SINGLE("Sigmatel DAC 6dB Attenuate", AC97_SIGMATEL_ANALOG, 1, 1, 0),
|
||||||
|
|
|
@ -800,7 +800,7 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)
|
||||||
"Capture Volume",
|
"Capture Volume",
|
||||||
"External Amplifier",
|
"External Amplifier",
|
||||||
"Sigmatel 4-Speaker Stereo Playback Switch",
|
"Sigmatel 4-Speaker Stereo Playback Switch",
|
||||||
"Sigmatel Surround Phase Inversion Playback ",
|
"Surround Phase Inversion Playback Switch",
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
static char *ca0106_rename_ctls[] = {
|
static char *ca0106_rename_ctls[] = {
|
||||||
|
|
Loading…
Reference in a new issue