summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-08 11:46:37 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-08 11:46:37 -0800
commitd238998fbfa49f30b02f0a5de5294ca53c58348c (patch)
tree6be58353f26552342b2fb8bec3e5cb35dedcb0ce /sound
parentb59f8197c5ddd0d5d74b663650be5449dacd34aa (diff)
downloadop-kernel-dev-d238998fbfa49f30b02f0a5de5294ca53c58348c.zip
op-kernel-dev-d238998fbfa49f30b02f0a5de5294ca53c58348c.tar.gz
Revert "hda_intel suspend latency: shorten codec read"
This reverts commit 57a04513cb35086d54bcb2cb92e6627fc8fa0fae. Harald Dunkel reports that it broke sound for him: "Alsa stopped working for me. I still can access /dev/dsp, change the volume and so on, but the speakers are quiet." Reverting it fixed things for him. Reported-and-tested-by: Harald Dunkel <harald.dunkel@t-online.de> Acked-by: Takashi Iwai <tiwai@suse.de> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_intel.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 62b9fb3..3fa0f97 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -555,8 +555,7 @@ static unsigned int azx_rirb_get_response(struct hda_codec *codec)
}
if (!chip->rirb.cmds)
return chip->rirb.res; /* the last value */
- udelay(10);
- cond_resched();
+ schedule_timeout_uninterruptible(1);
} while (time_after_eq(timeout, jiffies));
if (chip->msi) {
OpenPOWER on IntegriCloud