summaryrefslogtreecommitdiffstats
path: root/sound/pci/emu10k1/emu10k1_main.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-11-22 17:18:49 +0100
committerTakashi Iwai <tiwai@suse.de>2012-11-22 17:48:11 +0100
commit4f86f120d9d65b3a8f17e48dca1f991d861b5cd7 (patch)
treede69ce66dfbc6b4c0671782c975e7e1817da369a /sound/pci/emu10k1/emu10k1_main.c
parentALSA: emu10k1: cache emu1010 firmware (diff)
downloadlinux-4f86f120d9d65b3a8f17e48dca1f991d861b5cd7.tar.xz
linux-4f86f120d9d65b3a8f17e48dca1f991d861b5cd7.zip
ALSA: emu10k1: don't update firmware during suspend/resume
Add a flag to suppress the update in emu1010_firmware_thread() during suspend/resume. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/emu10k1/emu10k1_main.c')
-rw-r--r--sound/pci/emu10k1/emu10k1_main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 1dfb94d16b8b..cfd6cf952d44 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -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) {