Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 342613
b: refs/heads/master
c: 4f86f12
h: refs/heads/master
i:
  342611: 278caee
v: v3
  • Loading branch information
Takashi Iwai committed Nov 22, 2012
1 parent 4e8bb65 commit 3bdbfa2
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b209c4dfcd960ab176d4746ab7dc442a3edb4575
refs/heads/master: 4f86f120d9d65b3a8f17e48dca1f991d861b5cd7
1 change: 1 addition & 0 deletions trunk/include/sound/emu10k1.h
Original file line number Diff line number Diff line change
Expand Up @@ -1796,6 +1796,7 @@ struct snd_emu10k1 {
unsigned int *saved_icode;
unsigned int *p16v_saved;
unsigned int saved_a_iocfg, saved_hcfg;
bool suspend;
#endif

};
Expand Down
4 changes: 4 additions & 0 deletions trunk/sound/pci/emu10k1/emu10k1.c
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,8 @@ static int snd_emu10k1_suspend(struct device *dev)

snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);

emu->suspend = 1;

snd_pcm_suspend_all(emu->pcm);
snd_pcm_suspend_all(emu->pcm_mic);
snd_pcm_suspend_all(emu->pcm_efx);
Expand Down Expand Up @@ -260,6 +262,8 @@ static int snd_emu10k1_resume(struct device *dev)
if (emu->card_capabilities->ca0151_chip)
snd_p16v_resume(emu);

emu->suspend = 0;

snd_power_change_state(card, SNDRV_CTL_POWER_D0);
return 0;
}
Expand Down
2 changes: 2 additions & 0 deletions trunk/sound/pci/emu10k1/emu10k1_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,8 @@ static int emu1010_firmware_thread(void *data)
msleep_interruptible(1000);
if (kthread_should_stop())
break;
if (emu->suspend)
continue;
snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &tmp); /* IRQ Status */
snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg); /* OPTIONS: Which cards are attached to the EMU */
if (reg & EMU_HANA_OPTION_DOCK_OFFLINE) {
Expand Down

0 comments on commit 3bdbfa2

Please sign in to comment.