Skip to content

Commit

Permalink
mac_scsi: dont enable mac_scsi irq before requesting it
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Finn Thain authored and Geert Uytterhoeven committed Jan 22, 2012
1 parent d9070fc commit 37be2c8
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions drivers/scsi/mac_scsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,6 @@ static void mac_scsi_reset_boot(struct Scsi_Host *instance)

printk(KERN_INFO "Macintosh SCSI: resetting the SCSI bus..." );

/* switch off SCSI IRQ - catch an interrupt without IRQ bit set else */
disable_irq(IRQ_MAC_SCSI);

/* get in phase */
NCR5380_write( TARGET_COMMAND_REG,
PHASE_SR_TO_TCR( NCR5380_read(STATUS_REG) ));
Expand All @@ -358,9 +355,6 @@ static void mac_scsi_reset_boot(struct Scsi_Host *instance)
for( end = jiffies + AFTER_RESET_DELAY; time_before(jiffies, end); )
barrier();

/* switch on SCSI IRQ again */
enable_irq(IRQ_MAC_SCSI);

printk(KERN_INFO " done\n" );
}
#endif
Expand Down

0 comments on commit 37be2c8

Please sign in to comment.