From 1199380abe9deb00c2321ae8fbdcd6b8bd003501 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 21 Apr 2010 11:04:08 -0400 Subject: [PATCH] --- yaml --- r: 190183 b: refs/heads/master c: 715aa675338ce6e1a3b4f77cf87ea611f93058a8 h: refs/heads/master i: 190181: 194da29e7f0f2eed68befb6236b75fc222035baf 190179: ee20cf33c252a8966e7d06898da6f0dd3f727a8d 190175: 646b84bad5727ad855d36bf2e037fbc701d1e2c6 v: v3 --- [refs] | 2 +- trunk/sound/pci/maestro3.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5664cc4b09af..22cbd529329e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7efbfd1ae98ef9efe06352e2a1ad83e8c14ceeb1 +refs/heads/master: 715aa675338ce6e1a3b4f77cf87ea611f93058a8 diff --git a/trunk/sound/pci/maestro3.c b/trunk/sound/pci/maestro3.c index 728de232e091..b56e33676780 100644 --- a/trunk/sound/pci/maestro3.c +++ b/trunk/sound/pci/maestro3.c @@ -849,6 +849,7 @@ struct snd_m3 { struct snd_kcontrol *master_switch; struct snd_kcontrol *master_volume; struct tasklet_struct hwvol_tq; + unsigned int in_suspend; #ifdef CONFIG_PM u16 *suspend_mem; @@ -1614,6 +1615,11 @@ static void snd_m3_update_hw_volume(unsigned long private_data) outb(0x88, chip->iobase + SHADOW_MIX_REG_MASTER); outb(0x88, chip->iobase + HW_VOL_COUNTER_MASTER); + /* Ignore spurious HV interrupts during suspend / resume, this avoids + mistaking them for a mute button press. */ + if (chip->in_suspend) + return; + if (!chip->master_switch || !chip->master_volume) return; @@ -2425,6 +2431,7 @@ static int m3_suspend(struct pci_dev *pci, pm_message_t state) if (chip->suspend_mem == NULL) return 0; + chip->in_suspend = 1; snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); snd_pcm_suspend_all(chip->pcm); snd_ac97_suspend(chip->ac97); @@ -2498,6 +2505,7 @@ static int m3_resume(struct pci_dev *pci) snd_m3_hv_init(chip); snd_power_change_state(card, SNDRV_CTL_POWER_D0); + chip->in_suspend = 0; return 0; } #endif /* CONFIG_PM */