Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...

[linux-2.6] / drivers / cdrom / mcdx.c

diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c
index 788c7a0b2fe301600f4a5c6106e12fdb95592007..f574962f4288d36233491eb0d98f8968e2d0da2b 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;
 
-       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;
@@ -1193,7 +1189,7 @@ static int __init mcdx_init_drive(int drive)
        }
 
        xtrace(INIT, "init() subscribe irq and i/o\n");
-       if (request_irq(stuffp->irq, mcdx_intr, SA_INTERRUPT, "mcdx", stuffp)) {
+       if (request_irq(stuffp->irq, mcdx_intr, IRQF_DISABLED, "mcdx", stuffp)) {
                release_region(stuffp->wreg_data, MCDX_IO_SIZE);
                xwarn("%s=0x%03x,%d: Init failed. Can't get irq (%d).\n",
                      MCDX, stuffp->wreg_data, stuffp->irq, stuffp->irq);