Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 286791
b: refs/heads/master
c: 37be2c8
h: refs/heads/master
i:
  286789: ab3e98a
  286787: 93f1fd1
  286783: 6fa2a1c
v: v3
  • Loading branch information
Finn Thain authored and Geert Uytterhoeven committed Jan 22, 2012
1 parent 0ebf439 commit 4883bd5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d9070fc4997e255532f0519709c9326d043501b2
refs/heads/master: 37be2c86f0fbd89b66792008767e688c819b7c32
6 changes: 0 additions & 6 deletions trunk/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 4883bd5

Please sign in to comment.