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

9e956c2d · Linus Torvalds · 1a6a3589 · a6ceda74 · 9e956c2d
Commit 9e956c2d authored Feb 22, 2006 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

drivers/scsi/esp.c drivers/scsi/esp.c +1 -3

No files found.
--- 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;
 }