diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-20 09:44:00 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-20 09:44:00 -0400 |
| commit | d039ba24f135147f60a13bcaa768189a5b773b6e (patch) | |
| tree | 444b7596ab8312b5954d15c3135052a7c09c6fbe /drivers/scsi/ibmvscsi/ibmvscsi.c | |
| parent | 72e3148a6e987974e3e949c5668e5ca812d7c818 (diff) | |
| parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'drivers/scsi/ibmvscsi/ibmvscsi.c')
| -rw-r--r-- | drivers/scsi/ibmvscsi/ibmvscsi.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c index e89f76e5dd53..d89b8eb3cdf3 100644 --- a/drivers/scsi/ibmvscsi/ibmvscsi.c +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c | |||
| @@ -874,9 +874,7 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd) | |||
| 874 | return FAILED; | 874 | return FAILED; |
| 875 | } | 875 | } |
| 876 | 876 | ||
| 877 | spin_unlock_irq(hostdata->host->host_lock); | ||
| 878 | wait_for_completion(&evt->comp); | 877 | wait_for_completion(&evt->comp); |
| 879 | spin_lock_irq(hostdata->host->host_lock); | ||
| 880 | 878 | ||
| 881 | /* make sure we got a good response */ | 879 | /* make sure we got a good response */ |
| 882 | if (unlikely(srp_rsp.srp.generic.type != SRP_RSP_TYPE)) { | 880 | if (unlikely(srp_rsp.srp.generic.type != SRP_RSP_TYPE)) { |
| @@ -978,9 +976,7 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd) | |||
| 978 | return FAILED; | 976 | return FAILED; |
| 979 | } | 977 | } |
| 980 | 978 | ||
| 981 | spin_unlock_irq(hostdata->host->host_lock); | ||
| 982 | wait_for_completion(&evt->comp); | 979 | wait_for_completion(&evt->comp); |
| 983 | spin_lock_irq(hostdata->host->host_lock); | ||
| 984 | 980 | ||
| 985 | /* make sure we got a good response */ | 981 | /* make sure we got a good response */ |
| 986 | if (unlikely(srp_rsp.srp.generic.type != SRP_RSP_TYPE)) { | 982 | if (unlikely(srp_rsp.srp.generic.type != SRP_RSP_TYPE)) { |