From: Simon Kelley <simon@thekelleys.org.uk>
To: linux-kernel@vger.kernel.org
Subject: [PATCH] xirc2ps_cs.c got missed in the irqreturn_t swoop.
Date: Tue, 13 May 2003 18:03:50 +0100 [thread overview]
Message-ID: <3EC12576.5080300@thekelleys.org.uk> (raw)
diff -urN linux-2.5.69.orig/drivers/net/pcmcia/xirc2ps_cs.c
linux-2.5.69/drivers/net/pcmcia/xirc2ps_cs.c
--- linux-2.5.69.orig/drivers/net/pcmcia/xirc2ps_cs.c Mon May 5 00:53:13 2003
+++ linux-2.5.69/drivers/net/pcmcia/xirc2ps_cs.c Tue May 13 15:56:31 2003
@@ -317,7 +317,7 @@
* less on other parts of the kernel.
*/
-static void xirc2ps_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+static irqreturn_t xirc2ps_interrupt(int irq, void *dev_id, struct pt_regs *regs);
/*
* The dev_info variable is the "key" that is used to match up this
@@ -1296,7 +1296,7 @@
/****************
* This is the Interrupt service route.
*/
-static void
+static irqreturn_t
xirc2ps_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{
struct net_device *dev = (struct net_device *)dev_id;
@@ -1312,7 +1312,7 @@
*/
if (!netif_device_present(dev))
- return;
+ return IRQ_HANDLED;
ioaddr = dev->base_addr;
if (lp->mohawk) { /* must disable the interrupt */
@@ -1514,6 +1514,8 @@
* force an interrupt with this command:
* PutByte(XIRCREG_CR, EnableIntr|ForceIntr);
*/
+
+ return IRQ_HANDLED;
} /* xirc2ps_interrupt */
/*====================================================================*/
next reply other threads:[~2003-05-13 16:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-05-13 17:03 Simon Kelley [this message]
2003-05-13 17:55 ` Zwane Mwaikambo
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=3EC12576.5080300@thekelleys.org.uk \
--to=simon@thekelleys.org.uk \
--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
all inboxes | Powered by JetHome®