[Asterisk-cvs] zaptel zaptel.c,1.70,1.71

[markster at lists.digium.com]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv26258

Modified Files:
	zaptel.c 
Log Message:
More sleep fixes


Index: zaptel.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zaptel.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- zaptel.c	23 Apr 2004 22:33:44 -0000	1.70
+++ zaptel.c	26 Apr 2004 05:03:13 -0000	1.71
@@ -2563,14 +2563,15 @@
 		spin_unlock_irqrestore(&zaptimerlock, flags);
 		break;
 	case ZT_GETEVENT:  /* Get event on queue */
+		j = ZT_EVENT_NONE;
 		spin_lock_irqsave(&zaptimerlock, flags);
 		  /* set up for no event */
-		put_user(ZT_EVENT_NONE,(int *)data);
 		if (timer->tripped)
-			put_user(ZT_EVENT_TIMER_EXPIRED, (int *)data);		  
+			j = ZT_EVENT_TIMER_EXPIRED;
 		if (timer->ping)
-			put_user(ZT_EVENT_TIMER_PING, (int *)data);
+			j = ZT_EVENT_TIMER_PING;
 		spin_unlock_irqrestore(&zaptimerlock, flags);
+		put_user(j,(int *)data);
 		break;
 	case ZT_TIMERPING:
 		spin_lock_irqsave(&zaptimerlock, flags);
@@ -3292,8 +3293,8 @@
 			return (rv);
 		break;
 	case ZT_FLUSH:  /* flush input buffer, output buffer, and/or event queue */
-		spin_lock_irqsave(&chan->lock, flags);
 		get_user(i,(int *)data);  /* get param */
+		spin_lock_irqsave(&chan->lock, flags);
 		if (i & ZT_FLUSH_READ)  /* if for read (input) */
 		   {
 			  /* initialize read buffers and pointers */