public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Bernhard Rosenkraenzer <bero@arklinux.org>
To: akpm@osdl.org, linux-kernel@vger.kernel.org
Subject: [PATCH] 2.6.9-rc2-mm2 breaks serial driver compiles
Date: Thu, 23 Sep 2004 03:33:19 +0200	[thread overview]
Message-ID: <200409230333.19375.bero@arklinux.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 139 bytes --]

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

[-- Attachment #2: 2.6.9-rc2-mm2-compile.patch --]
[-- Type: text/x-diff, Size: 1483 bytes --]

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

                 reply	other threads:[~2004-09-23  1:36 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200409230333.19375.bero@arklinux.org \
    --to=bero@arklinux.org \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox