aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTommi Kyntola <tommi.kyntola@ray.fi>2007-03-09 16:15:06 +0100
committerJaroslav Kysela <perex@suse.cz>2007-03-14 08:24:16 +0100
commit19bfafb2ed1a59efb979b6725ab7626a94f7e078 (patch)
tree9d4856ec4d93a0851179e8425c14996b118d92a3 /sound/pci
parentc26a8de23a4417f556250c4c099b048b26c430be (diff)
downloadkernel_samsung_aries-19bfafb2ed1a59efb979b6725ab7626a94f7e078.zip
kernel_samsung_aries-19bfafb2ed1a59efb979b6725ab7626a94f7e078.tar.gz
kernel_samsung_aries-19bfafb2ed1a59efb979b6725ab7626a94f7e078.tar.bz2
[ALSA] intel8x0 - Fix speaker output after S2RAM
Fixed the mute speaker problem after S2RAM on some laptops: http://bugme.osdl.org/show_bug.cgi?id=6181 Signed-off-by: Tommi Kyntola <tommi.kyntola@ray.fi> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/intel8x0.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index a289abf..ff65e04 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -2470,7 +2470,10 @@ static int intel8x0_suspend(struct pci_dev *pci, pm_message_t state)
}
pci_disable_device(pci);
pci_save_state(pci);
- pci_set_power_state(pci, pci_choose_state(pci, state));
+ /* The call below may disable built-in speaker on some laptops
+ * after S2RAM. So, don't touch it.
+ */
+ /* pci_set_power_state(pci, pci_choose_state(pci, state)); */
return 0;
}