From mboxrd@z Thu Jan 1 00:00:00 1970 From: Finn Thain Subject: [PATCH 15/16] mac_scsi: dont enable mac_scsi irq before requesting it Date: Mon, 24 Oct 2011 01:11:23 +1100 Message-ID: <20111023141219.568755239@telegraphics.com.au> References: <20111023141108.856998818@telegraphics.com.au> Return-path: Received: from vm4.telegraphics.com.au ([98.124.60.149]:46081 "EHLO vps4.telegraphics.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755627Ab1JWOMY (ORCPT ); Sun, 23 Oct 2011 10:12:24 -0400 Content-Disposition: inline; filename=mac-scsi-dont-enable-irq Sender: linux-m68k-owner@vger.kernel.org List-Id: linux-m68k@vger.kernel.org To: Geert Uytterhoeven Cc: linux-m68k@vger.kernel.org, "James E.J. Bottomley" , linux-scsi@vger.kernel.org Don't enable the SCSI irq when initialising the chip -- the irq has no handler yet. Signed-off-by: Finn Thain Index: linux-m68k/drivers/scsi/mac_scsi.c =================================================================== --- linux-m68k.orig/drivers/scsi/mac_scsi.c 2011-10-22 23:02:38.000000000 +1100 +++ linux-m68k/drivers/scsi/mac_scsi.c 2011-10-22 23:44:51.000000000 +1100 @@ -339,9 +339,6 @@ static void mac_scsi_reset_boot(struct S 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) )); @@ -357,9 +354,6 @@ static void mac_scsi_reset_boot(struct S 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