diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:16 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:16 +0100 |
| commit | 9fb5430c3d6e96a74fd4406dbe7608f36abb9987 (patch) | |
| tree | 1c990d9f2f91f6daabbf2de957bea744dd2bcb71 /sound/oss/dmabuf.c | |
| parent | 4c5ecb7e59662a76754efdd41c6ed4415e6e9840 (diff) | |
| parent | e5bf48437370f3fc603e2dce12e8d3fb1a6a2457 (diff) | |
Merge branch 'topic/oss-fix' into for-linus
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 1e90d769b62..1bfcf7e8854 100644 --- a/sound/oss/dmabuf.c +++ b/sound/oss/dmabuf.c @@ -439,7 +439,7 @@ int DMAbuf_sync(int dev) DMAbuf_launch_output(dev, dmap); adev->dmap_out->flags |= DMA_SYNCING; adev->dmap_out->underrun_count = 0; - while (!signal_pending(current) && n++ <= adev->dmap_out->nbufs && + while (!signal_pending(current) && n++ < adev->dmap_out->nbufs && adev->dmap_out->qlen && adev->dmap_out->underrun_count == 0) { long t = dmabuf_timeout(dmap); spin_unlock_irqrestore(&dmap->lock,flags); |