diff --git a/[refs] b/[refs]
index cbf401b1deb8..4126b61d68a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e560261b75e4d7a6584045e332230eb8e0058c4
+refs/heads/master: 7025005f15896118de7724b5e27c67e65612d32f
diff --git a/trunk/drivers/staging/speakup/thread.c b/trunk/drivers/staging/speakup/thread.c
index 84531e70daf0..103c5c81ee85 100644
--- a/trunk/drivers/staging/speakup/thread.c
+++ b/trunk/drivers/staging/speakup/thread.c
@@ -21,11 +21,12 @@ int speakup_thread(void *data)
 	mutex_lock(&spk_mutex);
 	while (1) {
 		DEFINE_WAIT(wait);
-		while(1) {
+		while (1) {
 			spk_lock(flags);
 			our_sound = unprocessed_sound;
 			unprocessed_sound.active = 0;
-			prepare_to_wait(&speakup_event, &wait, TASK_INTERRUPTIBLE);
+			prepare_to_wait(&speakup_event, &wait,
+				TASK_INTERRUPTIBLE);
 			should_break = kthread_should_stop() ||
 				our_sound.active ||
 				(synth && synth->catch_up && synth->alive &&
@@ -42,9 +43,8 @@ int speakup_thread(void *data)
 		if (kthread_should_stop())
 			break;
 
-		if (our_sound.active) {
+		if (our_sound.active)
 			kd_mksound(our_sound.freq, our_sound.jiffies);
-		}
 		if (synth && synth->catch_up && synth->alive) {
 			/* It is up to the callee to take the lock, so that it
 			 * can sleep whenever it likes */