diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-06-29 15:23:08 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-07-27 09:55:51 -0700 |
| commit | dbcbd279f7764feb9e8d1051b58caab8866b65b8 (patch) | |
| tree | b09456fdf549d8dcf7cf21330aad60886ed38e35 | |
| parent | 27948f9a2538670e669554270bb2d5021f99ce97 (diff) | |
| download | lwn-dbcbd279f7764feb9e8d1051b58caab8866b65b8.tar.gz lwn-dbcbd279f7764feb9e8d1051b58caab8866b65b8.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 ae59dbaa53d9..42d4b13f1fa7 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 { |