diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 11:52:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 11:52:38 -0400 |
| commit | 710421cc7d295cc59eb2676fe2ba3bc3252c124e (patch) | |
| tree | 4aa11cd7ee64b394871195cb585f16700553f540 /sound/pci/emu10k1/emumixer.c | |
| parent | d7ef64a9f9987b29e3d911369a9d40122d5be2dd (diff) | |
| parent | f686c74cc3e78349d16d46fc72807354574b1516 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (346 commits)
ASoC: core: Don't set "(null)" as a driver name
ALSA: hda - Use LPIB for ATI/AMD chipsets as default
Revert "ALSA: hda - Use position_fix=3 as default for AMD chipsets"
ASoC: Tegra: Fix compile when debugfs not enabled
ASoC: spdif-dit: Add missing MODULE_*
SOUND: OSS: Remove Au1550 driver.
ALSA: hda - add Intel Panther Point HDMI codec id
ALSA: emu10k1 - Add dB range to Bass and Treble for SB Live!
ALSA: hda - Remove PCM mixer elements from Virtual Master of realtek
ALSA: hda - Fix input-src parse in patch_analog.c
ASoC: davinci-mcasp: enable ping-pong SRAM buffers
ASoC: add iPAQ hx4700 machine driver
ASoC: Asahi Kasei AK4641 codec driver
ALSA: hda - Enable Realtek ALC269 codec input layer beep
ALSA: intel8x0m: enable AMD8111 modem
ALSA: HDA: Add jack detection for HDMI
ALSA: sound, core, pcm_lib: fix xrun_log
ASoC: Max98095: Move existing NULL check before pointer dereference.
ALSA: sound, core, pcm_lib: xrun_log: log also in_interrupt
ALSA: usb-audio - Add support for USB X-Fi S51 Pro
...
Diffstat (limited to 'sound/pci/emu10k1/emumixer.c')
| -rw-r--r-- | sound/pci/emu10k1/emumixer.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c index 05afe06e353a..9d890a5aec5a 100644 --- a/sound/pci/emu10k1/emumixer.c +++ b/sound/pci/emu10k1/emumixer.c | |||
| @@ -1729,8 +1729,6 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu, | |||
| 1729 | "Master Mono Playback Volume", | 1729 | "Master Mono Playback Volume", |
| 1730 | "PCM Out Path & Mute", | 1730 | "PCM Out Path & Mute", |
| 1731 | "Mono Output Select", | 1731 | "Mono Output Select", |
| 1732 | "Front Playback Switch", | ||
| 1733 | "Front Playback Volume", | ||
| 1734 | "Surround Playback Switch", | 1732 | "Surround Playback Switch", |
| 1735 | "Surround Playback Volume", | 1733 | "Surround Playback Volume", |
| 1736 | "Center Playback Switch", | 1734 | "Center Playback Switch", |
| @@ -1879,6 +1877,8 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu, | |||
| 1879 | emu->rear_ac97 = 1; | 1877 | emu->rear_ac97 = 1; |
| 1880 | snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE|AC97SLOT_REAR_LEFT|AC97SLOT_REAR_RIGHT); | 1878 | snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE|AC97SLOT_REAR_LEFT|AC97SLOT_REAR_RIGHT); |
| 1881 | snd_ac97_write_cache(emu->ac97, AC97_HEADPHONE, 0x0202); | 1879 | snd_ac97_write_cache(emu->ac97, AC97_HEADPHONE, 0x0202); |
| 1880 | remove_ctl(card,"Front Playback Volume"); | ||
| 1881 | remove_ctl(card,"Front Playback Switch"); | ||
| 1882 | } | 1882 | } |
| 1883 | /* remove unused AC97 controls */ | 1883 | /* remove unused AC97 controls */ |
| 1884 | snd_ac97_write_cache(emu->ac97, AC97_SURROUND_MASTER, 0x0202); | 1884 | snd_ac97_write_cache(emu->ac97, AC97_SURROUND_MASTER, 0x0202); |
| @@ -1913,6 +1913,12 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu, | |||
| 1913 | for (; *c; c += 2) | 1913 | for (; *c; c += 2) |
| 1914 | rename_ctl(card, c[0], c[1]); | 1914 | rename_ctl(card, c[0], c[1]); |
| 1915 | 1915 | ||
| 1916 | if (emu->card_capabilities->subsystem == 0x80401102) { /* SB Live! Platinum CT4760P */ | ||
| 1917 | remove_ctl(card, "Center Playback Volume"); | ||
| 1918 | remove_ctl(card, "LFE Playback Volume"); | ||
| 1919 | remove_ctl(card, "Wave Center Playback Volume"); | ||
| 1920 | remove_ctl(card, "Wave LFE Playback Volume"); | ||
| 1921 | } | ||
| 1916 | if (emu->card_capabilities->subsystem == 0x20071102) { /* Audigy 4 Pro */ | 1922 | if (emu->card_capabilities->subsystem == 0x20071102) { /* Audigy 4 Pro */ |
| 1917 | rename_ctl(card, "Line2 Capture Volume", "Line1/Mic Capture Volume"); | 1923 | rename_ctl(card, "Line2 Capture Volume", "Line1/Mic Capture Volume"); |
| 1918 | rename_ctl(card, "Analog Mix Capture Volume", "Line2 Capture Volume"); | 1924 | rename_ctl(card, "Analog Mix Capture Volume", "Line2 Capture Volume"); |