From 0568e5e05d6311d08c44e29492ba32e2f2b1fdd8 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Mon, 31 Oct 2005 19:51:24 +0100 Subject: [PATCH] --- yaml --- r: 13912 b: refs/heads/master c: 3072c4abdd8c239a28085733adf3aaae94ad8fbe h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/megaraid/megaraid_sas.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2dc441f8a087..b6bd37c1ab9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7dfdc9a52b4219fba8240750e36de5db860ddd5f +refs/heads/master: 3072c4abdd8c239a28085733adf3aaae94ad8fbe diff --git a/trunk/drivers/scsi/megaraid/megaraid_sas.c b/trunk/drivers/scsi/megaraid/megaraid_sas.c index 4245d05e628b..2463f47adfda 100644 --- a/trunk/drivers/scsi/megaraid/megaraid_sas.c +++ b/trunk/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; }