Merge branch 'forlinus' of git://parisc-linux.org/home/kyle/git/parisc-2.6

[safe/jmp/linux-2.6] / drivers / scsi / qlogicfas408.c

diff --git a/drivers/scsi/qlogicfas408.c b/drivers/scsi/qlogicfas408.c
index 575f8a8..cb75e0b 100644 (file)
--- a/drivers/scsi/qlogicfas408.c
+++ b/drivers/scsi/qlogicfas408.c
@@ -511,8 +511,14 @@ int qlogicfas408_abort(Scsi_Cmnd * cmd)
 int qlogicfas408_bus_reset(Scsi_Cmnd * cmd)
 {
        struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);
+       unsigned long flags;
+
        priv->qabort = 2;
+
+       spin_lock_irqsave(cmd->device->host->host_lock, flags);
        ql_zap(priv);
+       spin_unlock_irqrestore(cmd->device->host->host_lock, flags);
+
        return SUCCESS;
 }