Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 175046
b: refs/heads/master
c: 7f66fe5
h: refs/heads/master
v: v3
  • Loading branch information
Shawn Bohrer authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent 213be47 commit a7657be
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 45af4977174e91ca5ee67802978e5ea02b087fe1
refs/heads/master: 7f66fe58cea91d60870bb7e80ba777aa233f206d
6 changes: 4 additions & 2 deletions trunk/drivers/staging/line6/playback.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@ static int submit_audio_out_urb(struct snd_pcm_substream *substream)
}
}

if ((line6pcm->pos_out += urb_frames) >= runtime->buffer_size)
line6pcm->pos_out += urb_frames;
if (line6pcm->pos_out >= runtime->buffer_size)
line6pcm->pos_out -= runtime->buffer_size;

urb_out->transfer_buffer_length = urb_size;
Expand Down Expand Up @@ -281,7 +282,8 @@ static void audio_out_callback(struct urb *urb)
if (!shutdown) {
submit_audio_out_urb(substream);

if ((line6pcm->bytes_out += length) >= line6pcm->period_out) {
line6pcm->bytes_out += length;
if (line6pcm->bytes_out >= line6pcm->period_out) {
line6pcm->bytes_out -= line6pcm->period_out;
snd_pcm_period_elapsed(substream);
}
Expand Down

0 comments on commit a7657be

Please sign in to comment.