aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/hpsa.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 415ad4fb50d4..82668505ccbb 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -1006,8 +1006,7 @@ static void hpsa_unmap_sg_chain_block(struct ctlr_info *h,
1006 pci_unmap_single(h->pdev, temp64.val, chain_sg->Len, PCI_DMA_TODEVICE); 1006 pci_unmap_single(h->pdev, temp64.val, chain_sg->Len, PCI_DMA_TODEVICE);
1007} 1007}
1008 1008
1009static void complete_scsi_command(struct CommandList *cp, 1009static void complete_scsi_command(struct CommandList *cp)
1010 int timeout, u32 tag)
1011{ 1010{
1012 struct scsi_cmnd *cmd; 1011 struct scsi_cmnd *cmd;
1013 struct ctlr_info *h; 1012 struct ctlr_info *h;
@@ -2936,7 +2935,7 @@ static inline void finish_cmd(struct CommandList *c, u32 raw_tag)
2936{ 2935{
2937 removeQ(c); 2936 removeQ(c);
2938 if (likely(c->cmd_type == CMD_SCSI)) 2937 if (likely(c->cmd_type == CMD_SCSI))
2939 complete_scsi_command(c, 0, raw_tag); 2938 complete_scsi_command(c);
2940 else if (c->cmd_type == CMD_IOCTL_PEND) 2939 else if (c->cmd_type == CMD_IOCTL_PEND)
2941 complete(c->waiting); 2940 complete(c->waiting);
2942} 2941}