1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index 456e4ede049f..cf2461d34e5f 100644
--- a/drivers/char/epca.c
+++ b/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);
         }
@@ -2480,7 +2477,11 @@ static int pc_send_break(struct tty_struct *tty, int msec)
         unsigned long flags;
 
         if (msec == -1)
-                return -EOPNOTSUPP;
+                msec = 0xFFFF;
+        else if (msec > 0xFFFE)
+                msec = 0xFFFE;
+        else if (msec < 1)
+                msec = 1;
 
         spin_lock_irqsave(&epca_lock, flags);
         globalwinon(ch);