From 3f8ef0408348f56b75b2e8dc72f9dacccb4bebb0 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Wed, 30 Apr 2008 00:53:52 -0700
Subject: [PATCH] --- yaml --- r: 95207 b: refs/heads/master c:
 1a4e2351e7fcf2d10bb5524b0ace7797ffad4d98 h: refs/heads/master i:   95205:
 a16a81e3314b5bfa044dbc7e3f6ed187127cf409   95203:
 8445fa99732ba92b3a2999d834403b1f8c7d666a   95199:
 fdbfb754f5d7b3d453d23965f152cd6c6ed84307 v: v3

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

diff --git a/[refs] b/[refs]
index 915695780f7e..04b0588a4c1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 709107fcd3c4ad82ff7c8137c27aa951d671706f
+refs/heads/master: 1a4e2351e7fcf2d10bb5524b0ace7797ffad4d98
diff --git a/trunk/drivers/char/cyclades.c b/trunk/drivers/char/cyclades.c
index 23312f244545..028db1b8fc4e 100644
--- a/trunk/drivers/char/cyclades.c
+++ b/trunk/drivers/char/cyclades.c
@@ -2747,8 +2747,8 @@ static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count)
 
 	spin_lock_irqsave(&info->card->card_lock, flags);
 	while (1) {
-		c = min(count, min((int)(SERIAL_XMIT_SIZE - info->xmit_cnt - 1),
-				   (int)(SERIAL_XMIT_SIZE - info->xmit_head)));
+		c = min(count, (int)(SERIAL_XMIT_SIZE - info->xmit_cnt - 1));
+		c = min(c, (int)(SERIAL_XMIT_SIZE - info->xmit_head));
 
 		if (c <= 0)
 			break;