From 305f80c7d739dac89b34fd3633c1c60111397c43 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@redhat.com>
Date: Mon, 13 Oct 2008 10:32:09 +0100
Subject: [PATCH] --- yaml --- r: 113407 b: refs/heads/master c:
 9ae7b08ad5c91baf9c223844bfd41ca9bc54917b h: refs/heads/master i:   113405:
 e474fb97a5cfb13cff8aed31e145f5b91586495c   113403:
 4f080c83fe897d040b40c2eb95b5ccc5363833f5   113399:
 84e2dfcd732babb1ee7b449129335e03fe84470b   113391:
 e7dbc3a35e7dd0785571a6f216a1c22496aaebc9   113375:
 e6b9f64aa67b78443af58370330b151f060cb663   113343:
 3ca58597bacae1539f30bebbf3edc9471c1fb4cf   113279:
 ca08df12c6c69d9bf5764faf5c989f873f2786ab   113151:
 604db9cac5749e8e997b0d0a4e79873a21b3766e v: v3

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

diff --git a/[refs] b/[refs]
index bd5a9dc0af3c..7c82d7bed16f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02f11f392434656f00fdcc8c51348d52bd39afe8
+refs/heads/master: 9ae7b08ad5c91baf9c223844bfd41ca9bc54917b
diff --git a/trunk/drivers/char/epca.c b/trunk/drivers/char/epca.c
index 456e4ede049f..4998b2761e8f 100644
--- a/trunk/drivers/char/epca.c
+++ b/trunk/drivers/char/epca.c
@@ -1376,6 +1376,7 @@ static void post_fep_init(unsigned int crd)
 		unsigned long flags;
 		u16 tseg, rseg;
 
+		tty_port_init(&ch->port);
 		ch->brdchan = bc;
 		ch->mailbox = gd;
 		INIT_WORK(&ch->tqueue, do_softint);
@@ -1510,10 +1511,6 @@ static void post_fep_init(unsigned int crd)
 		ch->fepstopca = 0;
 
 		ch->close_delay = 50;
-		ch->port.count = 0;
-		ch->port.blocked_open = 0;
-		init_waitqueue_head(&ch->port.open_wait);
-		init_waitqueue_head(&ch->port.close_wait);
 
 		spin_unlock_irqrestore(&epca_lock, flags);
 	}