diff options
author | Finn Thain <fthain@telegraphics.com.au> | 2011-10-23 10:11:23 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-01-22 08:50:03 -0500 |
commit | 37be2c86f0fbd89b66792008767e688c819b7c32 (patch) | |
tree | f0cd69d84c725fcb46a664c54ce8ff5393defe3c | |
parent | d9070fc4997e255532f0519709c9326d043501b2 (diff) |
mac_scsi: dont enable mac_scsi irq before requesting it
Don't enable the SCSI irq when initialising the chip -- the irq has no
handler yet.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
-rw-r--r-- | drivers/scsi/mac_scsi.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c index af3a6af97cc..737d526c081 100644 --- a/drivers/scsi/mac_scsi.c +++ b/drivers/scsi/mac_scsi.c | |||
@@ -340,9 +340,6 @@ static void mac_scsi_reset_boot(struct Scsi_Host *instance) | |||
340 | 340 | ||
341 | printk(KERN_INFO "Macintosh SCSI: resetting the SCSI bus..." ); | 341 | printk(KERN_INFO "Macintosh SCSI: resetting the SCSI bus..." ); |
342 | 342 | ||
343 | /* switch off SCSI IRQ - catch an interrupt without IRQ bit set else */ | ||
344 | disable_irq(IRQ_MAC_SCSI); | ||
345 | |||
346 | /* get in phase */ | 343 | /* get in phase */ |
347 | NCR5380_write( TARGET_COMMAND_REG, | 344 | NCR5380_write( TARGET_COMMAND_REG, |
348 | PHASE_SR_TO_TCR( NCR5380_read(STATUS_REG) )); | 345 | PHASE_SR_TO_TCR( NCR5380_read(STATUS_REG) )); |
@@ -358,9 +355,6 @@ static void mac_scsi_reset_boot(struct Scsi_Host *instance) | |||
358 | for( end = jiffies + AFTER_RESET_DELAY; time_before(jiffies, end); ) | 355 | for( end = jiffies + AFTER_RESET_DELAY; time_before(jiffies, end); ) |
359 | barrier(); | 356 | barrier(); |
360 | 357 | ||
361 | /* switch on SCSI IRQ again */ | ||
362 | enable_irq(IRQ_MAC_SCSI); | ||
363 | |||
364 | printk(KERN_INFO " done\n" ); | 358 | printk(KERN_INFO " done\n" ); |
365 | } | 359 | } |
366 | #endif | 360 | #endif |