2.6.9-rc2-mm2 breaks serial driver compiles

PATCH New Bernhard Rosenkraenzer 1 participant 1 message Sep 23, 2004

Subsystems (2)

Arm i.MX and Layerscape Char and misc drivers

lore

Share & tools

lore

Bernhard Rosenkraenzer

author

2004-09-23 01:36 UTC #0 lore raw

PATCH 1/1 2.6.9-rc2-mm2 breaks serial driver compiles

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

drivers/char/moxa.c renamed from drivers/char/moxa.c.ark +2 -2

@@ -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;
 		}

drivers/char/mxser.c renamed from drivers/char/mxser.c.ark +1 -0

@@ -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;

drivers/char/generic_serial.c renamed from drivers/char/generic_serial.c.ark +2 -2

@@ -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);
 	}