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

git-mirror · Feb 22, 2006 · 9e956c2 · 9e956c2
2 parents 1a6a358 + a6ceda7
commit 9e956c2
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c
@@ -2068,14 +2068,12 @@ static int esp_reset(struct scsi_cmnd *SCptr)
 {
 	struct esp *esp = (struct esp *) SCptr->device->host->hostdata;
 
+	spin_lock_irq(esp->ehost->host_lock);
 	(void) esp_do_resetbus(esp);
-
 	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;
 }