From 843541bac4d685417954d9212659f664eb3667f0 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Fri, 8 Dec 2006 02:39:31 -0800
Subject: [PATCH] --- yaml --- r: 43741 b: refs/heads/master c:
 90cc301859ea8840634324a7f5b9680312377667 h: refs/heads/master i:   43739:
 e474194f2e2174a65003718d1f2b6adf0e85e5fd v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/char/cyclades.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c91bf6f2900a..24ebbac72707 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 096dcfce39f952292b019a2c42c241782c9ca226
+refs/heads/master: 90cc301859ea8840634324a7f5b9680312377667
diff --git a/trunk/drivers/char/cyclades.c b/trunk/drivers/char/cyclades.c
index 7da6c3babb10..3ffa0807754c 100644
--- a/trunk/drivers/char/cyclades.c
+++ b/trunk/drivers/char/cyclades.c
@@ -1644,7 +1644,8 @@ cyz_handle_rx(struct cyclades_port *info,
 				char_count = rx_put - rx_get;
 			else
 				char_count = rx_put - rx_get + rx_bufsize;
-			if (char_count >= cy_readl(&buf_ctrl->rx_threshold)) {
+			if (char_count >= (int)cy_readl(&buf_ctrl->
+					rx_threshold)) {
 				cy_sched_event(info, Cy_EVENT_Z_RX_FULL);
 			}
 #endif
@@ -2941,7 +2942,7 @@ static void cy_put_char(struct tty_struct *tty, unsigned char ch)
 		return;
 
 	CY_LOCK(info, flags);
-	if (info->xmit_cnt >= SERIAL_XMIT_SIZE - 1) {
+	if (info->xmit_cnt >= (int)(SERIAL_XMIT_SIZE - 1)) {
 		CY_UNLOCK(info, flags);
 		return;
 	}