Browse Source

aha1542: Fix bus reset

Bus reset always fails because aha1542_reset waits for the controller to assert
the INIT bit (Mailbox Initialization Required) which it never does. This bit is
asserted only after host reset.

Remove the requirement for INIT bit (we really need only the IDLE bit).

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
Ondrej Zary 10 years ago
parent
commit
7061dec40c
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/scsi/aha1542.c

+ 1 - 1
drivers/scsi/aha1542.c

@@ -867,7 +867,7 @@ static int aha1542_reset(struct scsi_cmnd *cmd, u8 reset_cmd)
 	outb(reset_cmd, CONTROL(cmd->device->host->io_port));
 	outb(reset_cmd, CONTROL(cmd->device->host->io_port));
 
 
 	if (!wait_mask(STATUS(cmd->device->host->io_port),
 	if (!wait_mask(STATUS(cmd->device->host->io_port),
-	     STATMASK, INIT | IDLE, STST | DIAGF | INVDCMD | DF | CDF, 0)) {
+	     STATMASK, IDLE, STST | DIAGF | INVDCMD | DF | CDF, 0)) {
 		spin_unlock_irqrestore(sh->host_lock, flags);
 		spin_unlock_irqrestore(sh->host_lock, flags);
 		return FAILED;
 		return FAILED;
 	}
 	}