[alsa-cvslog] alsa-kernel: Official ALSA project GIT repository for Linux 2.6 branch, master now at
Brought to you by:
perex
From: <nor...@al...> - 2008-08-26 11:36:35
|
Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via b2f6f881ab704a865f7e6fdbffd323d648b03bab (commit) via 43479e9af166bc491fd9bd7175bc1350dbd815a0 (commit) based on 806ef7b5b12945d9f350b5397defb2ff13cf320e from 71f7c3fa84558fd3bd81670fd74e9f4cc7a188ee (commit) This ref update crossed a branch point; i.e. the old rev is not a strict subset of the new rev. This occurs, when you --force push a change in a situation like this: * -- * -- B -- O -- O -- O (71f7c3fa84558fd3bd81670fd74e9f4cc7a188ee) \ N -- N -- N (b2f6f881ab704a865f7e6fdbffd323d648b03bab) Therefore, we assume that you've already had alert emails for all of the O revisions, and now give you all the revisions in the N branch from the common base, B (806ef7b5b12945d9f350b5397defb2ff13cf320e), up to the new revision. - Log ----------------------------------------------------------------- commit b2f6f881ab704a865f7e6fdbffd323d648b03bab Author: Clemens Ladisch <cl...@la...> AuthorDate: Tue Aug 26 11:06:26 2008 +0200 Commit: Clemens Ladisch <cl...@la...> CommitDate: Tue Aug 26 11:06:26 2008 +0200 ALSA: oxygen: prevent muting of nonexistent AC97 controls The Xonar DX does not have CD Capture controls, so we have to check that a control actually exists before muting it. Signed-off-by: Clemens Ladisch <cl...@la...> Cc: <st...@ke...> commit 43479e9af166bc491fd9bd7175bc1350dbd815a0 Author: Travis Place <wi...@wi...> AuthorDate: Mon Aug 25 08:11:50 2008 +0200 Commit: Jaroslav Kysela <pe...@pe...> CommitDate: Mon Aug 25 09:57:54 2008 +0200 ALSA: CA0106 on MSI K8N Diamond PLUS Motherboard Correct a previous patch for the ca0106 onboard the MSI K8N Diamond PLUS motherboard. Confirmed to have Line/Mic/Aux working for input, and sound output working as expected. Signed-off-by: Travis Place <wi...@wi...> Signed-off-by: Takashi Iwai <ti...@su...> Signed-off-by: Jaroslav Kysela <pe...@pe...> ----------------------------------------------------------------------- Diffstat: sound/pci/ca0106/ca0106_main.c | 5 +++-- sound/pci/oxygen/oxygen_mixer.c | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) Patch -------------- (max 1500 lines) diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index 2f8b28a..a7d8966 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c @@ -249,11 +249,12 @@ static struct snd_ca0106_details ca0106_chip_details[] = { .name = "MSI K8N Diamond MB [SB0438]", .gpio_type = 2, .i2c_adc = 1 } , - /* Another MSI K8N Diamond MB, which has apprently a different SSID */ + /* MSI K8N Diamond PLUS MB */ { .serial = 0x10091102, .name = "MSI K8N Diamond MB", .gpio_type = 2, - .i2c_adc = 1 } , + .i2c_adc = 1, + .spi_dac = 2 } , /* Shuttle XPC SD31P which has an onboard Creative Labs * Sound Blaster Live! 24-bit EAX * high-definition 7.1 audio processor". diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c index 6facac5..05eb899 100644 --- a/sound/pci/oxygen/oxygen_mixer.c +++ b/sound/pci/oxygen/oxygen_mixer.c @@ -512,9 +512,12 @@ static int ac97_switch_get(struct snd_kcontrol *ctl, static void mute_ac97_ctl(struct oxygen *chip, unsigned int control) { - unsigned int priv_idx = chip->controls[control]->private_value & 0xff; + unsigned int priv_idx; u16 value; + if (!chip->controls[control]) + return; + priv_idx = chip->controls[control]->private_value & 0xff; value = oxygen_read_ac97(chip, 0, priv_idx); if (!(value & 0x8000)) { oxygen_write_ac97(chip, 0, priv_idx, value | 0x8000); ------- End of patch hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 71f7c3fa84558fd3bd81670fd74e9f4cc7a188ee \ b2f6f881ab704a865f7e6fdbffd323d648b03bab |