From bac31bac1fb3c7f7342b64db8027da0e38cd19cd Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@suse.cz>
Date: Tue, 16 Aug 2005 13:05:43 +0200
Subject: [PATCH] --- yaml --- r: 6545 b: refs/heads/master c:
 65d11d95515db3efb629202104cfc672476618b5 h: refs/heads/master i:   6543:
 063be19b8039101d78e7b91f4a989f6cabb97f8d v: v3

---
 [refs]                   | 2 +-
 trunk/sound/core/timer.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c0b993519440..9a894386f1a6 100644
--- 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
index 56bd383a06c2..4104f6e292e9 100644
--- 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;