---

yaml --- r: 281338 b: refs/heads/master c: 153e387 h: refs/heads/master v: v3
git-mirror · Dec 10, 2011 · 7c049cb · 7c049cb
1 parent e93c8a3
commit 7c049cb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f637ee42d4a60e1c3823beff3699354bd4400be
+refs/heads/master: 153e38761d27f29edf436f11da3dbfb4fb8edcc1
diff --git a/trunk/drivers/staging/line6/pcm.h b/trunk/drivers/staging/line6/pcm.h
@@ -145,11 +145,6 @@ struct snd_line6_pcm {
 	*/
 	unsigned char *buffer_in;
 
-	/**
-		 Temporary buffer index for playback.
-	*/
-	int index_out;
-
 	/**
 		 Previously captured frame (for software monitoring).
 	*/

diff --git a/trunk/drivers/staging/line6/playback.c b/trunk/drivers/staging/line6/playback.c
@@ -192,13 +192,10 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)
 	urb_frames = urb_size / bytes_per_frame;
 	urb_out->transfer_buffer =
 	    line6pcm->buffer_out +
-	    LINE6_ISO_PACKETS * line6pcm->max_packet_size * line6pcm->index_out;
+	    index * LINE6_ISO_PACKETS * line6pcm->max_packet_size;
 	urb_out->transfer_buffer_length = urb_size;
 	urb_out->context = line6pcm;
 
-	if (++line6pcm->index_out == LINE6_ISO_BUFFERS)
-		line6pcm->index_out = 0;
-
 	if (test_bit(BIT_PCM_ALSA_PLAYBACK, &line6pcm->flags) &&
 	    !test_bit(BIT_PAUSE_PLAYBACK, &line6pcm->flags)) {
 		struct snd_pcm_runtime *runtime =