diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-06-29 15:23:08 +0200 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-07-19 18:20:12 -0400 |
| commit | fa48403aa5c34a02e39f17d08cfd1da134205928 (patch) | |
| tree | 6fc128a2cf1f719bd3f3e36d9ccfa1920c026b1e /sound | |
| parent | 9f0a4f41de5d93907d09c6c18bc782d623b255ab (diff) | |
| download | lwn-fa48403aa5c34a02e39f17d08cfd1da134205928.tar.gz lwn-fa48403aa5c34a02e39f17d08cfd1da134205928.zip | |
ALSA: au88x0: Fix calculation in vortex_wtdma_bufshift()
[ Upstream commit 62db7152c924e4c060e42b34a69cd39658e8a0dc ]
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>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'sound')
| -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 72e81286b70e..8eae95acc09c 100644 --- a/sound/pci/au88x0/au88x0_core.c +++ b/sound/pci/au88x0/au88x0_core.c @@ -1442,9 +1442,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 { |