---

yaml --- r: 6545 b: refs/heads/master c: 65d11d9 h: refs/heads/master i: 6543: 063be19 v: v3
git-mirror · Aug 30, 2005 · bac31ba · bac31ba
1 parent a0c89c7
commit bac31ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ca307b28d6fa12f46b4ad32cb4bb854f8ee69c3
+refs/heads/master: 65d11d95515db3efb629202104cfc672476618b5
diff --git a/trunk/sound/core/timer.c b/trunk/sound/core/timer.c
@@ -1562,8 +1562,8 @@ static int snd_timer_user_params(struct file *file, snd_timer_params_t __user *_
 			      (1<<SNDRV_TIMER_EVENT_MSTART)|
 			      (1<<SNDRV_TIMER_EVENT_MSTOP)|
 			      (1<<SNDRV_TIMER_EVENT_MCONTINUE)|
-			      (1<<SNDRV_TIMER_EVENT_MPAUSE|
-			      (1<<SNDRV_TIMER_EVENT_MSUSPEND|
+			      (1<<SNDRV_TIMER_EVENT_MPAUSE)|
+			      (1<<SNDRV_TIMER_EVENT_MSUSPEND)|
 			      (1<<SNDRV_TIMER_EVENT_MRESUME))) {
 		err = -EINVAL;
 		goto _end;