diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-15 00:41:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-15 00:41:12 -0400 |
| commit | ff99e40230d5cdf5e48bcdb4938d0626624bc4cb (patch) | |
| tree | 9ea67e1d7f44db9704aa4f39df08452d24119820 | |
| parent | 2951157f054039fa4f19b4c05fbf206b7f9d2eec (diff) | |
| parent | 8d3ee2cb0ab59f78fdc801ede7db15ef47387bd0 (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.
| -rw-r--r-- | drivers/scsi/qlogicpti.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c index 9b827ceec501..9f10689905a8 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) | |||
| 1281 | (struct scatterlist *)Cmnd->request_buffer, | 1281 | (struct scatterlist *)Cmnd->request_buffer, |
| 1282 | Cmnd->use_sg, | 1282 | Cmnd->use_sg, |
| 1283 | Cmnd->sc_data_direction); | 1283 | Cmnd->sc_data_direction); |
| 1284 | } else { | 1284 | } else if (Cmnd->request_bufflen) { |
| 1285 | sbus_unmap_single(qpti->sdev, | 1285 | sbus_unmap_single(qpti->sdev, |
| 1286 | (__u32)((unsigned long)Cmnd->SCp.ptr), | 1286 | (__u32)((unsigned long)Cmnd->SCp.ptr), |
| 1287 | Cmnd->request_bufflen, | 1287 | Cmnd->request_bufflen, |