From 50ec046cd64b04611010b232b9bd9f56fcaf0ac3 Mon Sep 17 00:00:00 2001 From: "Stephen M. Cameron" Date: Fri, 3 Jun 2011 09:57:29 -0500 Subject: [PATCH] --- yaml --- r: 254307 b: refs/heads/master c: c2dd32e02648d77466f320d6edd157b5080e7c99 h: refs/heads/master i: 254305: 2eaceb204064c6b4aa85673210924a7deaaaaaaa 254303: f4293e71b2aa76f22f11747e89aed75dd04fe08f v: v3 --- [refs] | 2 +- trunk/drivers/scsi/hpsa.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d49b217cbb9c..9fe316d0c0d0 100644 --- 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 index c6c0434d8034..a75122d1c710 100644 --- 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 */