diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-05-20 17:20:44 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-05-20 17:20:44 -0500 |
| commit | 45d7c46d54dae008f66db58e6bd31d9b31833043 (patch) | |
| tree | 0e85cf3a39eadc84d3fb2b49d8697ed3a100ba9c /drivers/scsi/3w-xxxx.c | |
| parent | 279e677faa775ad16e75c32e1bf4a37f8158bc61 (diff) | |
| parent | 2b69a8a2b6e5f5d26a038a6494a88a1a776ac88f (diff) | |
| download | op-kernel-dev-45d7c46d54dae008f66db58e6bd31d9b31833043.zip op-kernel-dev-45d7c46d54dae008f66db58e6bd31d9b31833043.tar.gz | |
Merge branch 'scsi-fixes' into merge-base
Diffstat (limited to 'drivers/scsi/3w-xxxx.c')
| -rw-r--r-- | drivers/scsi/3w-xxxx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c index c03f1d2..faa0fcf 100644 --- a/drivers/scsi/3w-xxxx.c +++ b/drivers/scsi/3w-xxxx.c @@ -6,7 +6,7 @@ Arnaldo Carvalho de Melo <acme@conectiva.com.br> Brad Strand <linux@3ware.com> - Copyright (C) 1999-2007 3ware Inc. + Copyright (C) 1999-2009 3ware Inc. Kernel compatiblity By: Andre Hedrick <andre@suse.com> Non-Copyright (C) 2000 Andre Hedrick <andre@suse.com> @@ -1294,7 +1294,8 @@ static void tw_unmap_scsi_data(struct pci_dev *pdev, struct scsi_cmnd *cmd) { dprintk(KERN_WARNING "3w-xxxx: tw_unmap_scsi_data()\n"); - scsi_dma_unmap(cmd); + if (cmd->SCp.phase == TW_PHASE_SGLIST) + scsi_dma_unmap(cmd); } /* End tw_unmap_scsi_data() */ /* This function will reset a device extension */ |
