diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-06-29 15:23:08 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-08-22 22:37:17 +0100 |
| commit | a620c002d0a7c101f8e5790a6f57aa62209693f4 (patch) | |
| tree | dcbcced871fd3369d86510c39f50ab929cad38ff | |
| parent | 16e7b8c95fa6f8e57d9ab73597e31e3396f0c00d (diff) | |
| download | linux-stable-a620c002d0a7c101f8e5790a6f57aa62209693f4.tar.gz linux-stable-a620c002d0a7c101f8e5790a6f57aa62209693f4.tar.bz2 linux-stable-a620c002d0a7c101f8e5790a6f57aa62209693f4.zip | |
ALSA: au88x0: Fix calculation in vortex_wtdma_bufshift()
commit 62db7152c924e4c060e42b34a69cd39658e8a0dc upstream.
vortex_wtdma_bufshift() function does calculate the page index
wrongly, first masking then shift, which always results in zero.
The proper computation is to first shift, then mask.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | sound/pci/au88x0/au88x0_core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c index 489150380eac..dd6e74fd3d28 100644 --- a/sound/pci/au88x0/au88x0_core.c +++ b/sound/pci/au88x0/au88x0_core.c @@ -1444,9 +1444,8 @@ static int vortex_wtdma_bufshift(vortex_t * vortex, int wtdma) int page, p, pp, delta, i; page = - (hwread(vortex->mmio, VORTEX_WTDMA_STAT + (wtdma << 2)) & - WT_SUBBUF_MASK) - >> WT_SUBBUF_SHIFT; + (hwread(vortex->mmio, VORTEX_WTDMA_STAT + (wtdma << 2)) + >> WT_SUBBUF_SHIFT) & WT_SUBBUF_MASK; if (dma->nr_periods >= 4) delta = (page - dma->period_real) & 3; else { |