From e46f1f5d9e01fe9d610da738c207fd31a72fcd04 Mon Sep 17 00:00:00 2001
From: "M.Baris Demiray" <baris@labristeknoloji.com>
Date: Sat, 25 Jun 2005 14:58:40 -0700
Subject: [PATCH] --- yaml --- r: 3367 b: refs/heads/master c:
 d2a457cf26020fb7aa992915388001eb983d0aa8 h: refs/heads/master i:   3365:
 00da010f163e2712bb873c5910537cb3b9f954b1   3363:
 f65c0d6bde0c19ab7b7856ae2083c483cf5c11f5   3359:
 b02852f3c5f087a1ac31c5e0b45e84d32b7c3039 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/char/rio/riotty.c | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 61f711b0f1b8..9ce58a054904 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b1ee233f52c247d3a074ce660ece08bf097a47b
+refs/heads/master: d2a457cf26020fb7aa992915388001eb983d0aa8
diff --git a/trunk/drivers/char/rio/riotty.c b/trunk/drivers/char/rio/riotty.c
index db655002671f..78a321afdf4f 100644
--- a/trunk/drivers/char/rio/riotty.c
+++ b/trunk/drivers/char/rio/riotty.c
@@ -524,16 +524,16 @@ riotclose(void  *ptr)
 	register uint SysPort = dev;
 	struct ttystatics *tp;		/* pointer to our ttystruct */
 #endif
-	struct Port *PortP =ptr;	/* pointer to the port structure */
+	struct Port *PortP = ptr;	/* pointer to the port structure */
 	int deleted = 0;
 	int	try = -1; /* Disable the timeouts by setting them to -1 */
 	int	repeat_this = -1; /* Congrats to those having 15 years of 
 				     uptime! (You get to break the driver.) */
-	long end_time;
+	unsigned long end_time;
 	struct tty_struct * tty;
 	unsigned long flags;
 	int Modem;
-	int rv =0;
+	int rv = 0;
 	
 	rio_dprintk (RIO_DEBUG_TTY, "port close SysPort %d\n",PortP->PortNum);
 
@@ -620,7 +620,7 @@ riotclose(void  *ptr)
 		if (repeat_this -- <= 0) {
 			rv = -EINTR;
 			rio_dprintk (RIO_DEBUG_TTY, "Waiting for not idle closed broken by signal\n");
-			RIOPreemptiveCmd(p, PortP, FCLOSE ); 
+			RIOPreemptiveCmd(p, PortP, FCLOSE);
 			goto close_end;
 		}
 		rio_dprintk (RIO_DEBUG_TTY, "Calling timeout to flush in closing\n");
@@ -656,14 +656,12 @@ riotclose(void  *ptr)
 		goto close_end;
 	}
 
-	
-
 	/* Can't call RIOShortCommand with the port locked. */
 	rio_spin_unlock_irqrestore(&PortP->portSem, flags);
 
 	if (RIOShortCommand(p, PortP, CLOSE, 1, 0) == RIO_FAIL) {
-	  RIOPreemptiveCmd(p, PortP,FCLOSE);
-	  goto close_end;
+		RIOPreemptiveCmd(p, PortP, FCLOSE);
+		goto close_end;
 	}
 
 	if (!deleted)
@@ -698,7 +696,6 @@ riotclose(void  *ptr)
 */
 	PortP->Config &= ~(RIO_CTSFLOW|RIO_RTSFLOW);
 
-
 #ifdef STATS
 	PortP->Stat.CloseCnt++;
 #endif