Merge branch 'fix/misc' into topic/misc
This commit is contained in:
commit
6458a54423
|
@ -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;
|
||||
|
@ -884,6 +885,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_m3_ids) = {
|
|||
MODULE_DEVICE_TABLE(pci, snd_m3_ids);
|
||||
|
||||
static struct snd_pci_quirk m3_amp_quirk_list[] __devinitdata = {
|
||||
SND_PCI_QUIRK(0x0E11, 0x0094, "Compaq Evo N600c", 0x0c),
|
||||
SND_PCI_QUIRK(0x10f7, 0x833e, "Panasonic CF-28", 0x0d),
|
||||
SND_PCI_QUIRK(0x10f7, 0x833d, "Panasonic CF-72", 0x0d),
|
||||
SND_PCI_QUIRK(0x1033, 0x80f1, "NEC LM800J/7", 0x03),
|
||||
|
@ -1613,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;
|
||||
|
||||
|
@ -2424,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);
|
||||
|
@ -2497,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 */
|
||||
|
|
Loading…
Reference in a new issue