diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-11 11:17:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-11 11:17:15 +0100 |
| commit | c34c0d7684b8b79666da6b1bc37fc330cd0dd216 (patch) | |
| tree | c2bc72d67862df770af45a88814759baa0744d2c /sound/oss/dmabuf.c | |
| parent | 29dc5dd229dc3130b51df0932e59946fc09d3bd4 (diff) | |
| parent | 4345adf92db760ca1a54061ce284aaa2e7d0791e (diff) | |
| download | linux-0-day-c34c0d7684b8b79666da6b1bc37fc330cd0dd216.tar.gz linux-0-day-c34c0d7684b8b79666da6b1bc37fc330cd0dd216.tar.xz | |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'sound/oss/dmabuf.c')
| -rw-r--r-- | sound/oss/dmabuf.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/oss/dmabuf.c b/sound/oss/dmabuf.c index a59c88818f48a..461d94cfecbee 100644 --- a/sound/oss/dmabuf.c +++ b/sound/oss/dmabuf.c @@ -557,7 +557,6 @@ int DMAbuf_getrdbuffer(int dev, char **buf, int *len, int dontblock) unsigned long flags; int err = 0, n = 0; struct dma_buffparms *dmap = adev->dmap_in; - int go; if (!(adev->open_mode & OPEN_READ)) return -EIO; @@ -584,7 +583,7 @@ int DMAbuf_getrdbuffer(int dev, char **buf, int *len, int dontblock) spin_unlock_irqrestore(&dmap->lock,flags); return -EAGAIN; } - if ((go = adev->go)) + if (adev->go) timeout = dmabuf_timeout(dmap); spin_unlock_irqrestore(&dmap->lock,flags); |