---

yaml --- r: 254307 b: refs/heads/master c: c2dd32e h: refs/heads/master i: 254305: 2eaceb2 254303: f4293e7 v: v3
git-mirror · Jun 29, 2011 · 50ec046 · 50ec046
1 parent bb56e33
commit 50ec046
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38553564dc1052640515ed86be3ccb76cda6eee7
+refs/heads/master: c2dd32e02648d77466f320d6edd157b5080e7c99
diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/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 */