From ae274528b3e04a482a2b9a6d13ea85861f8ed536 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@novell.com>
Date: Wed, 9 Dec 2009 12:34:13 -0800
Subject: [PATCH] --- yaml --- r: 185183 b: refs/heads/master c:
 a357e777b5982d5f460a2783d697a8a90d497348 h: refs/heads/master i:   185181:
 b5ebd475c671502cbe181482f2800b67d5012bd8   185179:
 4d06a0384864f6e1f65479722195baa6f414c4e7   185175:
 0289ced4d5880c64c590e8b339999de8de395d5b   185167:
 d4ce891907071c4a37829760e061160bb89a76c1   185151:
 4d178c6715f3ac6d22d097a4abaa590181d12816 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/char/cyclades.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 976e53cda507..29dfebe58a90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e091751cdb2c28f9f25041be0dcb4d33e4a833d
+refs/heads/master: a357e777b5982d5f460a2783d697a8a90d497348
diff --git a/trunk/drivers/char/cyclades.c b/trunk/drivers/char/cyclades.c
index 4254457d3911..274e9651fa36 100644
--- a/trunk/drivers/char/cyclades.c
+++ b/trunk/drivers/char/cyclades.c
@@ -598,12 +598,6 @@ static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
 	save_car = readb(base_addr + (CyCAR << index));
 	cy_writeb(base_addr + (CyCAR << index), save_xir);
 
-	/* validate the port# (as configured and open) */
-	if (channel + chip * 4 >= cinfo->nports) {
-		cy_writeb(base_addr + (CySRER << index),
-			  readb(base_addr + (CySRER << index)) & ~CyTxRdy);
-		goto end;
-	}
 	info = &cinfo->ports[channel + chip * 4];
 	tty = tty_port_tty_get(&info->port);
 	if (tty == NULL) {