Another fix for 10 second hang on closing sound driver

popcornmix · popcornmix · commit 5892cced6dab · 2012-10-08T16:33:08.000+01:00
diff --git a/sound/arm/bcm2835-pcm.c b/sound/arm/bcm2835-pcm.c
@@ -72,7 +72,7 @@ static irqreturn_t bcm2835_playback_fifo_irq(int irq, void *dev_id)
 			  frames_to_bytes(alsa_stream->substream->runtime, alsa_stream->substream->runtime->status->hw_ptr),
 			  new_period);
 	if (alsa_stream->buffer_size) {
-		alsa_stream->pos += consumed;
+		alsa_stream->pos += consumed &~ (1<<30);
 		alsa_stream->pos %= alsa_stream->buffer_size;
 	}
 
diff --git a/sound/arm/bcm2835.h b/sound/arm/bcm2835.h
@@ -28,7 +28,7 @@
 /*
 #define AUDIO_DEBUG_ENABLE
 #define AUDIO_VERBOSE_DEBUG_ENABLE
-*.
+*/
 
 /* Debug macros */
 

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ static irqreturn_t bcm2835_playback_fifo_irq(int irq, void *dev_id)`
`72`	`72`	`frames_to_bytes(alsa_stream->substream->runtime, alsa_stream->substream->runtime->status->hw_ptr),`
`73`	`73`	`new_period);`
`74`	`74`	`if (alsa_stream->buffer_size) {`
`75`		`- alsa_stream->pos += consumed;`
	`75`	`+ alsa_stream->pos += consumed &~ (1<<30);`
`76`	`76`	`alsa_stream->pos %= alsa_stream->buffer_size;`
`77`	`77`	`}`
`78`	`78`