Commit ff99e402 authored by Linus Torvalds's avatar Linus Torvalds

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.
parents 2951157f 8d3ee2cb
...@@ -1281,7 +1281,7 @@ static struct scsi_cmnd *qlogicpti_intr_handler(struct qlogicpti *qpti) ...@@ -1281,7 +1281,7 @@ static struct scsi_cmnd *qlogicpti_intr_handler(struct qlogicpti *qpti)
(struct scatterlist *)Cmnd->request_buffer, (struct scatterlist *)Cmnd->request_buffer,
Cmnd->use_sg, Cmnd->use_sg,
Cmnd->sc_data_direction); Cmnd->sc_data_direction);
} else { } else if (Cmnd->request_bufflen) {
sbus_unmap_single(qpti->sdev, sbus_unmap_single(qpti->sdev,
(__u32)((unsigned long)Cmnd->SCp.ptr), (__u32)((unsigned long)Cmnd->SCp.ptr),
Cmnd->request_bufflen, Cmnd->request_bufflen,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment