Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / drivers / scsi / wd33c93.c

diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index 9341703dee008cf0f7ef7311be99451e2c18a604..27307fe5a4c8d8b7ea3d19d25ee3decbe8818e01 100644 (file)
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -939,6 +939,7 @@ wd33c93_intr(struct Scsi_Host *instance)
                DB(DB_INTR, printk("%02x", cmd->SCp.Status))
                    if (hostdata->level2 >= L2_BASIC) {
                        sr = read_wd33c93(regs, WD_SCSI_STATUS);        /* clear interrupt */
+                       udelay(7);
                        hostdata->state = S_RUNNING_LEVEL2;
                        write_wd33c93(regs, WD_COMMAND_PHASE, 0x50);
                        write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER);
@@ -955,6 +956,7 @@ wd33c93_intr(struct Scsi_Host *instance)
 
                msg = read_1_byte(regs);
                sr = read_wd33c93(regs, WD_SCSI_STATUS);        /* clear interrupt */
+               udelay(7);
 
                hostdata->incoming_msg[hostdata->incoming_ptr] = msg;
                if (hostdata->incoming_msg[0] == EXTENDED_MESSAGE)
@@ -1358,6 +1360,7 @@ wd33c93_intr(struct Scsi_Host *instance)
                        } else {
                                /* Verify this is a change to MSG_IN and read the message */
                                sr = read_wd33c93(regs, WD_SCSI_STATUS);
+                               udelay(7);
                                if (sr == (CSR_ABORT | PHS_MESS_IN) ||
                                    sr == (CSR_UNEXP | PHS_MESS_IN) ||
                                    sr == (CSR_SRV_REQ | PHS_MESS_IN)) {
@@ -1374,6 +1377,7 @@ wd33c93_intr(struct Scsi_Host *instance)
                                                             asr);
                                        }
                                        sr = read_wd33c93(regs, WD_SCSI_STATUS);
+                                       udelay(7);
                                        if (sr != CSR_MSGIN)
                                                printk
                                                    ("wd33c93: Not paused with ACK on RESEL (%02x)\n",