diff options
Diffstat (limited to 'drivers/cdrom')
-rw-r--r-- | drivers/cdrom/cdu31a.c | 2 | ||||
-rw-r--r-- | drivers/cdrom/mcdx.c | 2 | ||||
-rw-r--r-- | drivers/cdrom/sonycd535.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/cdrom/cdu31a.c b/drivers/cdrom/cdu31a.c index 5f0f2027f29e..37bdb0163f0d 100644 --- a/drivers/cdrom/cdu31a.c +++ b/drivers/cdrom/cdu31a.c | |||
@@ -3141,7 +3141,7 @@ int __init cdu31a_init(void) | |||
3141 | 3141 | ||
3142 | if (cdu31a_irq > 0) { | 3142 | if (cdu31a_irq > 0) { |
3143 | if (request_irq | 3143 | if (request_irq |
3144 | (cdu31a_irq, cdu31a_interrupt, SA_INTERRUPT, | 3144 | (cdu31a_irq, cdu31a_interrupt, IRQF_DISABLED, |
3145 | "cdu31a", NULL)) { | 3145 | "cdu31a", NULL)) { |
3146 | printk(KERN_WARNING PFX "Unable to grab IRQ%d for " | 3146 | printk(KERN_WARNING PFX "Unable to grab IRQ%d for " |
3147 | "the CDU31A driver\n", cdu31a_irq); | 3147 | "the CDU31A driver\n", cdu31a_irq); |
diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c index 788c7a0b2fe3..dcd1ab684f3e 100644 --- a/drivers/cdrom/mcdx.c +++ b/drivers/cdrom/mcdx.c | |||
@@ -1193,7 +1193,7 @@ static int __init mcdx_init_drive(int drive) | |||
1193 | } | 1193 | } |
1194 | 1194 | ||
1195 | xtrace(INIT, "init() subscribe irq and i/o\n"); | 1195 | xtrace(INIT, "init() subscribe irq and i/o\n"); |
1196 | if (request_irq(stuffp->irq, mcdx_intr, SA_INTERRUPT, "mcdx", stuffp)) { | 1196 | if (request_irq(stuffp->irq, mcdx_intr, IRQF_DISABLED, "mcdx", stuffp)) { |
1197 | release_region(stuffp->wreg_data, MCDX_IO_SIZE); | 1197 | release_region(stuffp->wreg_data, MCDX_IO_SIZE); |
1198 | xwarn("%s=0x%03x,%d: Init failed. Can't get irq (%d).\n", | 1198 | xwarn("%s=0x%03x,%d: Init failed. Can't get irq (%d).\n", |
1199 | MCDX, stuffp->wreg_data, stuffp->irq, stuffp->irq); | 1199 | MCDX, stuffp->wreg_data, stuffp->irq, stuffp->irq); |
diff --git a/drivers/cdrom/sonycd535.c b/drivers/cdrom/sonycd535.c index 8f7cc452af8d..30ab56258a92 100644 --- a/drivers/cdrom/sonycd535.c +++ b/drivers/cdrom/sonycd535.c | |||
@@ -1527,7 +1527,7 @@ static int __init sony535_init(void) | |||
1527 | } | 1527 | } |
1528 | if (sony535_irq_used > 0) { | 1528 | if (sony535_irq_used > 0) { |
1529 | if (request_irq(sony535_irq_used, cdu535_interrupt, | 1529 | if (request_irq(sony535_irq_used, cdu535_interrupt, |
1530 | SA_INTERRUPT, CDU535_HANDLE, NULL)) { | 1530 | IRQF_DISABLED, CDU535_HANDLE, NULL)) { |
1531 | printk("Unable to grab IRQ%d for the " CDU535_MESSAGE_NAME | 1531 | printk("Unable to grab IRQ%d for the " CDU535_MESSAGE_NAME |
1532 | " driver; polling instead.\n", sony535_irq_used); | 1532 | " driver; polling instead.\n", sony535_irq_used); |
1533 | sony535_irq_used = 0; | 1533 | sony535_irq_used = 0; |