diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-22 15:23:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-22 15:23:05 -0800 |
| commit | 9e956c2dac9bec602ed1ba29181b45ba6d2b6448 (patch) | |
| tree | e5c715e51dd56b199d542852ca2b60f76d32ddc2 | |
| parent | 1a6a35894f10870d5590199d1785d3a718927abe (diff) | |
| parent | a6ceda7457b2303dcb07d3c472b25d52bbdb5a29 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
| -rw-r--r-- | drivers/scsi/esp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c index f6900538be9..87a8c3d2072 100644 --- 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; } |