fix mismerge in ll_rw_blk.c

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

diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c
index 30cbf73c7433d930c2ea197bf9c56dca3d89928d..d12342fa81999e5938313cbb9f33734a63f44998 100644 (file)
--- a/drivers/scsi/gvp11.c
+++ b/drivers/scsi/gvp11.c
@@ -345,7 +345,15 @@ release:
 static int gvp11_bus_reset(Scsi_Cmnd *cmd)
 {
        /* FIXME perform bus-specific reset */
+
+       /* FIXME 2: shouldn't we no-op this function (return
+          FAILED), and fall back to host reset function,
+          wd33c93_host_reset ? */
+
+       spin_lock_irq(cmd->device->host->host_lock);
        wd33c93_host_reset(cmd);
+       spin_unlock_irq(cmd->device->host->host_lock);
+
        return SUCCESS;
 }