Merge tag 'hwmon-for-v7.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...

[linux.git] / drivers / scsi / hpsa.c

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index a1b116cd4723d57cacd043350afd1e8177d15b7e..8edad1830abe4d83770d0ebc83bc519b2e8f6c9d 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -5017,6 +5017,10 @@ static int hpsa_scsi_ioaccel2_queue_command(struct ctlr_info *h,
 
        if (phys_disk->in_reset) {
                cmd->result = DID_RESET << 16;
+               atomic_dec(&phys_disk->ioaccel_cmds_out);
+               scsi_dma_unmap(cmd);
+               if (use_sg > h->ioaccel_maxsg)
+                       hpsa_unmap_ioaccel2_sg_chain_block(h, cp);
                return -1;
        }