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.

drivers/scsi/qlogicpti.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,