From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Stephen M. Cameron" Subject: [PATCH 4/5] hpsa: Fix incorrect SCSI status reporting Date: Tue, 08 Dec 2009 15:38:27 -0600 Message-ID: <20091208213827.23493.88533.stgit@beardog.cce.hp.com> References: <20091208213514.23493.86458.stgit@beardog.cce.hp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: Received: from g4t0017.houston.hp.com ([15.201.24.20]:19646 "EHLO g4t0017.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966470AbZLHVto (ORCPT ); Tue, 8 Dec 2009 16:49:44 -0500 In-Reply-To: <20091208213514.23493.86458.stgit@beardog.cce.hp.com> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: James.Bottomley@HansenPartnership.com, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, mikem@beardog.cce.hp.com, linux-scsi@vger.kernel.org, smcameron@yahoo.com From: Stephen M. Cameron hpsa: Fix incorrect SCSI status reporting Signed-off-by: Stephen M. Cameron --- drivers/scsi/hpsa.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 0e696ee..380236a 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -930,7 +930,7 @@ static void complete_scsi_command(struct CommandList *cp, cmd->result = (DID_OK << 16); /* host byte */ cmd->result |= (COMMAND_COMPLETE << 8); /* msg byte */ - cmd->result |= (ei->ScsiStatus); + cmd->result |= (ei->ScsiStatus << 1); /* copy the sense data whether we need to or not. */ memcpy(cmd->sense_buffer, ei->SenseInfo, @@ -991,7 +991,6 @@ static void complete_scsi_command(struct CommandList *cp, /* Must be some other type of check condition */ - cmd->result |= (ei->ScsiStatus << 1); dev_warn(&h->pdev->dev, "cp %p has check condition: " "unknown type: " "Sense: 0x%x, ASC: 0x%x, ASCQ: 0x%x, " @@ -1013,8 +1012,6 @@ static void complete_scsi_command(struct CommandList *cp, * Pass it up to the upper layers... */ if (ei->ScsiStatus) { - - cmd->result |= (ei->ScsiStatus << 1); dev_warn(&h->pdev->dev, "cp %p has status 0x%x " "Sense: 0x%x, ASC: 0x%x, ASCQ: 0x%x, " "Returning result: 0x%x\n",