[PATCH] 2.6.9-rc2-mm2 breaks serial driver compiles

From: Bernhard Rosenkraenzer
Date: Wed Sep 22 2004 - 20:37:28 EST


SSIA - fix attached.
The patch makes the serial drivers compile; due to lack of hardware I can't
verify if they actually work.

LLaP
bero
--- linux-2.6.8/drivers/char/moxa.c.ark 2004-09-23 03:23:22.000000000 +0200
+++ linux-2.6.8/drivers/char/moxa.c 2004-09-23 03:23:35.000000000 +0200
@@ -958,7 +958,7 @@
if (MoxaPortTxQueue(ch->port) <= WAKEUP_CHARS) {
if (!tp->stopped) {
ch->statusflags &= ~LOWWAIT;
- tty_wakeup(tty);
+ tty_wakeup(ch->tty);
wake_up_interruptible(&tp->write_wait);
}
}
@@ -1125,7 +1125,7 @@
if (ch->tty && (ch->statusflags & EMPTYWAIT)) {
if (MoxaPortTxQueue(ch->port) == 0) {
ch->statusflags &= ~EMPTYWAIT;
- tty_wakeup(tty);
+ tty_wakeup(ch->tty);
wake_up_interruptible(&ch->tty->write_wait);
return;
}
--- linux-2.6.8/drivers/char/mxser.c.ark 2004-09-23 03:25:48.000000000 +0200
+++ linux-2.6.8/drivers/char/mxser.c 2004-09-23 03:26:28.000000000 +0200
@@ -740,6 +740,7 @@
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
unsigned long flags;
unsigned long timeout;
+ struct tty_ldisc *ld;

if (PORTNO(tty) == MXSER_PORTS)
return;
--- linux-2.6.8/drivers/char/generic_serial.c.ark 2004-09-23 03:27:54.000000000 +0200
+++ linux-2.6.8/drivers/char/generic_serial.c 2004-09-23 03:31:35.000000000 +0200
@@ -692,7 +692,7 @@
struct gs_port *port;
struct tty_ldisc *ld;

- func_enter ()
+ func_enter ();

if (!tty) return;

@@ -760,7 +760,7 @@

ld = tty_ldisc_ref(tty);
if (ld != NULL) {
- ld->flush_buffer)
+ if(ld->flush_buffer)
ld->flush_buffer(tty);
tty_ldisc_deref(ld);
}