aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-14 21:41:12 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-14 21:41:12 -0700
commitff99e40230d5cdf5e48bcdb4938d0626624bc4cb (patch)
tree9ea67e1d7f44db9704aa4f39df08452d24119820 /drivers
parent2951157f054039fa4f19b4c05fbf206b7f9d2eec (diff)
parent8d3ee2cb0ab59f78fdc801ede7db15ef47387bd0 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SCSI] QLOGICPTI: Do not unmap DMA unless we actually mapped something.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/qlogicpti.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index 9b827ceec50..9f10689905a 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -1281,7 +1281,7 @@ static struct scsi_cmnd *qlogicpti_intr_handler(struct qlogicpti *qpti)
(struct scatterlist *)Cmnd->request_buffer,
Cmnd->use_sg,
Cmnd->sc_data_direction);
- } else {
+ } else if (Cmnd->request_bufflen) {
sbus_unmap_single(qpti->sdev,
(__u32)((unsigned long)Cmnd->SCp.ptr),
Cmnd->request_bufflen,