From: Jaroslav Kysela <perex@suse.cz>
Date: Tue, 16 Aug 2005 11:05:43 +0000 (+0200)
Subject: [ALSA] ALSA timer - fixed compilation
X-Git-Tag: v2.6.14-rc1~1029^2~28
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65d11d95515db3efb629202104cfc672476618b5;p=pandora-kernel.git

[ALSA] ALSA timer - fixed compilation

Timer Midlevel

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
---

diff --git a/sound/core/timer.c b/sound/core/timer.c
index 56bd383a06c2..4104f6e292e9 100644
--- a/sound/core/timer.c
+++ b/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;