---

yaml --- r: 342583 b: refs/heads/master c: 063f603 h: refs/heads/master i: 342581: fd160db 342579: fe18d06 342575: 5d33b1f v: v3
git-mirror · Nov 12, 2012 · 2206a77 · 2206a77
1 parent 9078d6b
commit 2206a77
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: ef8784453d1cd5beedce9d288d56221a898c7ecb
+refs/heads/master: 063f603c8c1039f576405bb98c1b6c94262e5806
diff --git a/trunk/sound/pci/ice1712/ice1724.c b/trunk/sound/pci/ice1712/ice1724.c
@@ -2362,8 +2362,10 @@ static int __devinit snd_vt1724_read_eeprom(struct snd_ice1712 *ice,
 	}
 	printk(KERN_WARNING "ice1724: No matching model found for ID 0x%x\n",
 	       ice->eeprom.subvendor);
+#ifdef CONFIG_PM_SLEEP
 	/* assume AC97-only card which can suspend without additional code */
 	ice->pm_suspend_enabled = 1;
+#endif
 
  found:
 	ice->eeprom.size = snd_vt1724_read_i2c(ice, dev, 0x04);