From: Tim Waugh <twaugh@redhat.com>
To: Marek Michalkiewicz <marekm@amelek.gda.pl>
Cc: serial24@macrolink.com, linux-kernel@vger.kernel.org
Subject: Re: [patch] fix parport_serial / serial link order (for 2.4.20-pre8)
Date: Mon, 30 Sep 2002 10:40:12 +0100 [thread overview]
Message-ID: <20020930094012.GC20605@redhat.com> (raw)
In-Reply-To: <E17uesu-0002dE-00@mm.lan.amelek.gda.pl>
[-- Attachment #1: Type: text/plain, Size: 1483 bytes --]
On Thu, Sep 26, 2002 at 10:05:16PM +0200, Marek Michalkiewicz wrote:
> below is a patch that moves parport_serial.c from drivers/parport/
> to drivers/char/ - this fixes the wrong link order when the drivers
> are compiled into the kernel.
What was wrong with the original, much smaller patch that you sent me
previously (below)?
I'm happy to accept whichever patch is the better.
Tim.
*/
2002-08-28 Marek Michalkiewicz <marekm@amelek.gda.pl> [sent 2002-08-28]
* drivers/char/serial.c (register_serial): Call rs_init() if it
hasn't already been called. For parport_serial.c.
--- linux/drivers/char/serial.c.init_order 2002-08-28 20:55:10.000000000 +0100
+++ linux/drivers/char/serial.c 2002-08-28 21:00:24.000000000 +0100
@@ -254,6 +254,7 @@
static struct tty_driver serial_driver, callout_driver;
static int serial_refcount;
+static int serial_initialized;
static struct timer_list serial_timer;
@@ -5385,6 +5386,10 @@
int i;
struct serial_state * state;
+ if (serial_initialized)
+ return;
+ serial_initialized++;
+
init_bh(SERIAL_BH, do_serial_bh);
init_timer(&serial_timer);
serial_timer.function = rs_timer;
@@ -5603,6 +5608,11 @@
struct async_struct *info;
unsigned long port;
+ if (!serial_initialized) {
+ printk("register_serial(): calling rs_init()\n");
+ rs_init();
+ }
+
port = req->port;
if (HIGH_BITS_OFFSET)
port += (unsigned long) req->port_high << HIGH_BITS_OFFSET;
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2002-09-30 9:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-09-26 20:05 [patch] fix parport_serial / serial link order (for 2.4.20-pre8) Marek Michalkiewicz
2002-09-27 1:18 ` Zwane Mwaikambo
2002-09-27 6:35 ` Marek Michalkiewicz
2002-09-28 4:24 ` Zwane Mwaikambo
2002-09-29 18:00 ` Marek Michalkiewicz
2002-09-29 19:14 ` Zwane Mwaikambo
2002-09-29 20:24 ` Marek Michalkiewicz
2002-09-30 9:20 ` Zwane Mwaikambo
2002-09-30 10:27 ` Marek Michalkiewicz
2002-09-30 9:40 ` Tim Waugh [this message]
2002-09-30 9:49 ` Russell King
2002-09-30 10:07 ` Marek Michalkiewicz
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=20020930094012.GC20605@redhat.com \
--to=twaugh@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marekm@amelek.gda.pl \
--cc=serial24@macrolink.com \
/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;
as well as URLs for NNTP newsgroup(s).