git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
cdrom
/
mcdx.c
diff --git
a/drivers/cdrom/mcdx.c
b/drivers/cdrom/mcdx.c
index
dcd1ab6
..
f574962
100644
(file)
--- a/
drivers/cdrom/mcdx.c
+++ b/
drivers/cdrom/mcdx.c
@@
-845,15
+845,11
@@
static void mcdx_delay(struct s_drive_stuff *stuff, long jifs)
}
}
}
}
-static irqreturn_t mcdx_intr(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t mcdx_intr(int irq, void *dev_id)
{
struct s_drive_stuff *stuffp = dev_id;
unsigned char b;
{
struct s_drive_stuff *stuffp = dev_id;
unsigned char b;
- if (stuffp == NULL) {
- xwarn("mcdx: no device for intr %d\n", irq);
- return IRQ_NONE;
- }
#ifdef AK2
if (!stuffp->busy && stuffp->pending)
stuffp->int_err = 1;
#ifdef AK2
if (!stuffp->busy && stuffp->pending)
stuffp->int_err = 1;