From 4883bd5105ca8410aeb044a0c8b6d42c7ccb8965 Mon Sep 17 00:00:00 2001 From: Finn Thain Date: Mon, 24 Oct 2011 01:11:23 +1100 Subject: [PATCH] --- yaml --- r: 286791 b: refs/heads/master c: 37be2c86f0fbd89b66792008767e688c819b7c32 h: refs/heads/master i: 286789: ab3e98a7a98db96d9b4b59c90d95a68073832662 286787: 93f1fd19d27ccd33efb9665aa5239cb50efbf25a 286783: 6fa2a1c3b5319fbc8f377e5598d02031a2f33031 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/mac_scsi.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index cfda0d745189..ad164d3781d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9070fc4997e255532f0519709c9326d043501b2 +refs/heads/master: 37be2c86f0fbd89b66792008767e688c819b7c32 diff --git a/trunk/drivers/scsi/mac_scsi.c b/trunk/drivers/scsi/mac_scsi.c index af3a6af97cc7..737d526c0813 100644 --- a/trunk/drivers/scsi/mac_scsi.c +++ b/trunk/drivers/scsi/mac_scsi.c @@ -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