Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / scsi / NCR53C9x.c

diff --git a/drivers/scsi/NCR53C9x.c b/drivers/scsi/NCR53C9x.c
index 74293f62a622cea46eb9d4ee1a45ba755066fd6c..6ceabbd42a3d22374106ca4d1d4f71e7e85b1e60 100644 (file)
--- a/drivers/scsi/NCR53C9x.c
+++ b/drivers/scsi/NCR53C9x.c
@@ -1467,14 +1467,12 @@ int esp_reset(Scsi_Cmnd *SCptr)
 {
        struct NCR_ESP *esp = (struct NCR_ESP *) SCptr->device->host->hostdata;
 
+       spin_lock_irq(esp->ehost->host_lock);
        (void) esp_do_resetbus(esp, esp->eregs);
-
        spin_unlock_irq(esp->ehost->host_lock);
 
        wait_event(esp->reset_queue, (esp->resetting_bus == 0));
 
-       spin_lock_irq(esp->ehost->host_lock);
-
        return SUCCESS;
 }
 
@@ -1824,7 +1822,10 @@ static int esp_do_data(struct NCR_ESP *esp, struct ESP_regs *eregs)
                /* loop */
                while (hmuch) {
                        int j, fifo_stuck = 0, newphase;
-                       unsigned long flags, timeout;
+                       unsigned long timeout;
+#if 0
+                       unsigned long flags;
+#endif
 #if 0
                        if ( i % 10 )
                                ESPDATA(("\r"));