diff --git a/[refs] b/[refs]
index 057066ba4236..923c2f6d57e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45af4977174e91ca5ee67802978e5ea02b087fe1
+refs/heads/master: 7f66fe58cea91d60870bb7e80ba777aa233f206d
diff --git a/trunk/drivers/staging/line6/playback.c b/trunk/drivers/staging/line6/playback.c
index 4192cd9d96d5..3431f5cd2852 100644
--- a/trunk/drivers/staging/line6/playback.c
+++ b/trunk/drivers/staging/line6/playback.c
@@ -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;
@@ -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);
 		}