[SCSI] hpsa: fix dma unmap error in hpsa_passthru_ioctl

Stephen M. Cameron · James Bottomley · commit c2dd32e02648 · 2011-06-29T12:09:53.000-05:00
Signed-off-by: Stephen M. Cameron &lt;scameron@beardog.cce.hp.com&gt;
Signed-off-by: James Bottomley &lt;JBottomley@Parallels.com&gt;
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
@@ -2580,7 +2580,8 @@ static int hpsa_passthru_ioctl(struct ctlr_info *h, void __user *argp)
 		c->SG[0].Ext = 0; /* we are not chaining*/
 	}
 	hpsa_scsi_do_simple_cmd_core(h, c);
-	hpsa_pci_unmap(h->pdev, c, 1, PCI_DMA_BIDIRECTIONAL);
+	if (iocommand.buf_size > 0)
+		hpsa_pci_unmap(h->pdev, c, 1, PCI_DMA_BIDIRECTIONAL);
 	check_ioctl_unit_attention(h, c);
 
 	/* Copy the error information out */

Original file line number	Diff line number	Diff line change
`@@ -2580,7 +2580,8 @@ static int hpsa_passthru_ioctl(struct ctlr_info h, void __user argp)`
`2580`	`2580`	`c->SG[0].Ext = 0; /* we are not chaining*/`
`2581`	`2581`	`}`
`2582`	`2582`	`hpsa_scsi_do_simple_cmd_core(h, c);`
`2583`		`- hpsa_pci_unmap(h->pdev, c, 1, PCI_DMA_BIDIRECTIONAL);`
	`2583`	`+ if (iocommand.buf_size > 0)`
	`2584`	`+ hpsa_pci_unmap(h->pdev, c, 1, PCI_DMA_BIDIRECTIONAL);`
`2584`	`2585`	`check_ioctl_unit_attention(h, c);`
`2585`	`2586`
`2586`	`2587`	`/* Copy the error information out */`