Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
 "Two small driver fixes: aacraid to fix an unknown IU type on task
  management functions which causes a firmware fault and vmw_pvscsi to
  change a return code to retry the operation instead of causing an
  immediate error"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: aacraid: Correct hba_send to include iu_type
  scsi: vmw-pvscsi: return DID_BUS_BUSY for adapter-initated aborts

2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 0156c9623c35..d62ddd63f4fe 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -724,6 +724,8 @@ int aac_hba_send(u8 command, struct fib *fibptr, fib_callback callback,
         int wait;
         unsigned long flags = 0;
         unsigned long mflags = 0;
+        struct aac_hba_cmd_req *hbacmd = (struct aac_hba_cmd_req *)
+                        fibptr->hw_fib_va;
 
         fibptr->flags = (FIB_CONTEXT_FLAG | FIB_CONTEXT_FLAG_NATIVE_HBA);
         if (callback) {
@@ -734,11 +736,9 @@ int aac_hba_send(u8 command, struct fib *fibptr, fib_callback callback,
                 wait = 1;
 
 
-        if (command == HBA_IU_TYPE_SCSI_CMD_REQ) {
-                struct aac_hba_cmd_req *hbacmd =
-                        (struct aac_hba_cmd_req *)fibptr->hw_fib_va;
+        hbacmd->iu_type = command;
 
-                hbacmd->iu_type = command;
+        if (command == HBA_IU_TYPE_SCSI_CMD_REQ) {
                 /* bit1 of request_id must be 0 */
                 hbacmd->request_id =
                         cpu_to_le32((((u32)(fibptr - dev->fibs)) << 2) + 1);
diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
index c374e3b5c678..777e5f1e52d1 100644
--- a/drivers/scsi/vmw_pvscsi.c
+++ b/drivers/scsi/vmw_pvscsi.c
@@ -609,7 +609,7 @@ static void pvscsi_complete_request(struct pvscsi_adapter *adapter,
                         break;
 
                 case BTSTAT_ABORTQUEUE:
-                        cmd->result = (DID_ABORT << 16);
+                        cmd->result = (DID_BUS_BUSY << 16);
                         break;
 
                 case BTSTAT_SCSIPARITY: