git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
1a6a358
)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
author
Linus Torvalds
<torvalds@g5.osdl.org>
Wed, 22 Feb 2006 23:23:05 +0000
(15:23 -0800)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Wed, 22 Feb 2006 23:23:05 +0000
(15:23 -0800)
drivers/scsi/esp.c
patch
|
blob
|
history
diff --git
a/drivers/scsi/esp.c
b/drivers/scsi/esp.c
index
f690053
..
87a8c3d
100644
(file)
--- 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;
}