Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37be2c86 authored by Finn Thain's avatar Finn Thain Committed by Geert Uytterhoeven
Browse files

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: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent d9070fc4

drivers/scsi/mac_scsi.c

+0 −6
Original line number Diff line number Diff line
@@ -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) ));
@@ -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