diff options
Diffstat (limited to 'arch/m68k/mac/oss.c')
| -rw-r--r-- | arch/m68k/mac/oss.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c index 8426501119ca..f3d23d6ebcf8 100644 --- a/arch/m68k/mac/oss.c +++ b/arch/m68k/mac/oss.c | |||
| @@ -66,16 +66,21 @@ void __init oss_init(void) | |||
| 66 | 66 | ||
| 67 | void __init oss_register_interrupts(void) | 67 | void __init oss_register_interrupts(void) |
| 68 | { | 68 | { |
| 69 | request_irq(OSS_IRQLEV_SCSI, oss_irq, IRQ_FLG_LOCK, | 69 | if (request_irq(OSS_IRQLEV_SCSI, oss_irq, IRQ_FLG_LOCK, |
| 70 | "scsi", (void *) oss); | 70 | "scsi", (void *) oss)) |
| 71 | request_irq(OSS_IRQLEV_IOPSCC, mac_scc_dispatch, IRQ_FLG_LOCK, | 71 | pr_err("Couldn't register %s interrupt\n", "scsi"); |
| 72 | "scc", mac_scc_dispatch); | 72 | if (request_irq(OSS_IRQLEV_IOPSCC, mac_scc_dispatch, IRQ_FLG_LOCK, |
| 73 | request_irq(OSS_IRQLEV_NUBUS, oss_nubus_irq, IRQ_FLG_LOCK, | 73 | "scc", mac_scc_dispatch)) |
| 74 | "nubus", (void *) oss); | 74 | pr_err("Couldn't register %s interrupt\n", "scc"); |
| 75 | request_irq(OSS_IRQLEV_SOUND, oss_irq, IRQ_FLG_LOCK, | 75 | if (request_irq(OSS_IRQLEV_NUBUS, oss_nubus_irq, IRQ_FLG_LOCK, |
| 76 | "sound", (void *) oss); | 76 | "nubus", (void *) oss)) |
| 77 | request_irq(OSS_IRQLEV_VIA1, via1_irq, IRQ_FLG_LOCK, | 77 | pr_err("Couldn't register %s interrupt\n", "nubus"); |
| 78 | "via1", (void *) via1); | 78 | if (request_irq(OSS_IRQLEV_SOUND, oss_irq, IRQ_FLG_LOCK, |
| 79 | "sound", (void *) oss)) | ||
| 80 | pr_err("Couldn't register %s interrupt\n", "sound"); | ||
| 81 | if (request_irq(OSS_IRQLEV_VIA1, via1_irq, IRQ_FLG_LOCK, | ||
| 82 | "via1", (void *) via1)) | ||
| 83 | pr_err("Couldn't register %s interrupt\n", "via1"); | ||
| 79 | } | 84 | } |
| 80 | 85 | ||
| 81 | /* | 86 | /* |