diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 13:12:41 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 13:12:41 -0400 |
| commit | 8d0bc2b456103a34c11e01305cd1aed1cde579e5 (patch) | |
| tree | 5e1e6ad55cc9e2b5c5617f6f320114b8cff9e3f3 /drivers/scsi/wd7000.c | |
| parent | 30ba3ead05763b172acaa65ae1be71af2a878940 (diff) | |
| parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) | |
Merge commit 'v2.6.34' into next
Diffstat (limited to 'drivers/scsi/wd7000.c')
| -rw-r--r-- | drivers/scsi/wd7000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c index d0b7d2ff9ac5..333580bf37c5 100644 --- a/drivers/scsi/wd7000.c +++ b/drivers/scsi/wd7000.c | |||
| @@ -1587,7 +1587,7 @@ static int wd7000_host_reset(struct scsi_cmnd *SCpnt) | |||
| 1587 | { | 1587 | { |
| 1588 | Adapter *host = (Adapter *) SCpnt->device->host->hostdata; | 1588 | Adapter *host = (Adapter *) SCpnt->device->host->hostdata; |
| 1589 | 1589 | ||
| 1590 | spin_unlock_irq(SCpnt->device->host->host_lock); | 1590 | spin_lock_irq(SCpnt->device->host->host_lock); |
| 1591 | 1591 | ||
| 1592 | if (wd7000_adapter_reset(host) < 0) { | 1592 | if (wd7000_adapter_reset(host) < 0) { |
| 1593 | spin_unlock_irq(SCpnt->device->host->host_lock); | 1593 | spin_unlock_irq(SCpnt->device->host->host_lock); |