diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
| commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
| tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /sound/oss/dmabuf.c | |
| parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
| parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) | |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
Diffstat (limited to 'sound/oss/dmabuf.c')
| -rw-r--r-- | sound/oss/dmabuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/dmabuf.c b/sound/oss/dmabuf.c index 1e90d769b62e..1bfcf7e88546 100644 --- a/sound/oss/dmabuf.c +++ b/sound/oss/dmabuf.c | |||
| @@ -439,7 +439,7 @@ int DMAbuf_sync(int dev) | |||
| 439 | DMAbuf_launch_output(dev, dmap); | 439 | DMAbuf_launch_output(dev, dmap); |
| 440 | adev->dmap_out->flags |= DMA_SYNCING; | 440 | adev->dmap_out->flags |= DMA_SYNCING; |
| 441 | adev->dmap_out->underrun_count = 0; | 441 | adev->dmap_out->underrun_count = 0; |
| 442 | while (!signal_pending(current) && n++ <= adev->dmap_out->nbufs && | 442 | while (!signal_pending(current) && n++ < adev->dmap_out->nbufs && |
| 443 | adev->dmap_out->qlen && adev->dmap_out->underrun_count == 0) { | 443 | adev->dmap_out->qlen && adev->dmap_out->underrun_count == 0) { |
| 444 | long t = dmabuf_timeout(dmap); | 444 | long t = dmabuf_timeout(dmap); |
| 445 | spin_unlock_irqrestore(&dmap->lock,flags); | 445 | spin_unlock_irqrestore(&dmap->lock,flags); |