summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2012-11-04 23:34:58 +0100
committerTakashi Iwai <tiwai@suse.de>2012-11-05 12:32:35 +0100
commit5c0ee9497b33cde3e57460efe4f73313dc0b57a3 (patch)
tree11000a2740097ac4330249c7a363bba0efd72d6e /sound
parentALSA: HDA: Mark CS260x immutable structures const (diff)
downloadlinux-5c0ee9497b33cde3e57460efe4f73313dc0b57a3.tar.xz
linux-5c0ee9497b33cde3e57460efe4f73313dc0b57a3.zip
ALSA: es1968: Add ESS vendor ID to pm_whitelist
Add generic ESS vendor ID to pm_whitelist. This should fix suspend on all Maestro-2 and Maestro-2E based PCI cards. Tested on Terratec DMX and SF64-PCE2. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/es1968.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 5d0e568fdea1..50169bcfd903 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -2655,6 +2655,8 @@ static struct ess_device_list pm_whitelist[] __devinitdata = {
{ TYPE_MAESTRO2E, 0x1179 },
{ TYPE_MAESTRO2E, 0x14c0 }, /* HP omnibook 4150 */
{ TYPE_MAESTRO2E, 0x1558 },
+ { TYPE_MAESTRO2E, 0x125d }, /* a PCI card, e.g. Terratec DMX */
+ { TYPE_MAESTRO2, 0x125d }, /* a PCI card, e.g. SF64-PCE2 */
};
static struct ess_device_list mpu_blacklist[] __devinitdata = {