aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-09-21 08:38:02 -0400
committerTakashi Iwai <tiwai@suse.de>2016-09-21 08:38:02 -0400
commitdb68577966abc1aeae4ec597b3dcfa0d56e92041 (patch)
tree564e5e767f3cb22620ba0902562973957a4bd063
parent3f640970a41429f0a076c01270bbd014c9eae61c (diff)
ALSA: ali5451: Fix out-of-bound position reporting
The pointer callbacks of ali5451 driver may return the value at the boundary occasionally, and it results in the kernel warning like snd_ali5451 0000:00:06.0: BUG: , pos = 16384, buffer size = 16384, period size = 1024 It seems that folding the position offset is enough for fixing the warning and no ill-effect has been seen by that. Reported-by: Enrico Mioso <mrkiko.rs@gmail.com> Tested-by: Enrico Mioso <mrkiko.rs@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/ali5451/ali5451.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index 36470af7eda7..92b819e4f729 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -1408,6 +1408,7 @@ snd_ali_playback_pointer(struct snd_pcm_substream *substream)
1408 spin_unlock(&codec->reg_lock); 1408 spin_unlock(&codec->reg_lock);
1409 dev_dbg(codec->card->dev, "playback pointer returned cso=%xh.\n", cso); 1409 dev_dbg(codec->card->dev, "playback pointer returned cso=%xh.\n", cso);
1410 1410
1411 cso %= runtime->buffer_size;
1411 return cso; 1412 return cso;
1412} 1413}
1413 1414
@@ -1428,6 +1429,7 @@ static snd_pcm_uframes_t snd_ali_pointer(struct snd_pcm_substream *substream)
1428 cso = inw(ALI_REG(codec, ALI_CSO_ALPHA_FMS + 2)); 1429 cso = inw(ALI_REG(codec, ALI_CSO_ALPHA_FMS + 2));
1429 spin_unlock(&codec->reg_lock); 1430 spin_unlock(&codec->reg_lock);
1430 1431
1432 cso %= runtime->buffer_size;
1431 return cso; 1433 return cso;
1432} 1434}
1433 1435