diff options
| author |   James Bottomley <jejb@mulgrave.(none)> | 2005-11-08 12:50:26 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-11-08 12:50:26 -0500 |
| commit | 383f9749505cef0a30dbd7109db7fe469aa64753 (patch) | |
| tree | 9e88d648396ac99a90d12ccf5471d001e87c65ae /drivers/scsi/megaraid/megaraid_sas.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge (diff) | |
| parent | [SCSI] cciss: scsi error handling (diff) | |
| download | linux-dev-383f9749505cef0a30dbd7109db7fe469aa64753.tar.xz linux-dev-383f9749505cef0a30dbd7109db7fe469aa64753.zip | |
Merge by hand (conflicts between pending drivers and kfree cleanups)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_sas.c')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c index 4245d05e628b..2463f47adfda 100644 --- a/drivers/scsi/megaraid/megaraid_sas.c +++ b/drivers/scsi/megaraid/megaraid_sas.c @@ -767,17 +767,12 @@ static int megasas_generic_reset(struct scsi_cmnd *scmd) return FAILED; } - spin_unlock(scmd->device->host->host_lock); - ret_val = megasas_wait_for_outstanding(instance); - if (ret_val == SUCCESS) printk(KERN_NOTICE "megasas: reset successful \n"); else printk(KERN_ERR "megasas: failed to do reset\n"); - spin_lock(scmd->device->host->host_lock); - return ret_val; } |