---

yaml --- r: 95207 b: refs/heads/master c: 1a4e235 h: refs/heads/master i: 95205: a16a81e 95203: 8445fa9 95199: fdbfb75 v: v3
git-mirror · Apr 30, 2008 · 3f8ef04 · 3f8ef04
1 parent 940870a
commit 3f8ef04
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;