---

yaml --- r: 342615 b: refs/heads/master c: 2efa1d5 h: refs/heads/master i: 342613: 3bdbfa2 342611: 278caee 342607: 6ee7997 v: v3
git-mirror · Nov 22, 2012 · a555a14 · a555a14
1 parent 277ac67
commit a555a14
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8232932d32c12e35d0dc9311221ea1945f4efc8e
+refs/heads/master: 2efa1d59fe5af81456393472121623c9502548ce
diff --git a/trunk/sound/pci/emu10k1/emu10k1_main.c b/trunk/sound/pci/emu10k1/emu10k1_main.c
@@ -714,8 +714,10 @@ static int emu1010_firmware_thread(void *data)
 		msleep_interruptible(1000);
 		if (kthread_should_stop())
 			break;
+#ifdef CONFIG_PM_SLEEP
 		if (emu->suspend)
 			continue;
+#endif
 		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) {