Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (9cdcaa2c) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/scsi/megaraid.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -1753,6 +1753,14 @@ mega_build_sglist(adapter_t adapter, scb_t scb, u32 buf, u32 len)

		*len = 0;

		if (scsi_sg_count(cmd) == 1 && !adapter->has_64bit_addr) {
		sg = scsi_sglist(cmd);
		scb->dma_h_bulkdata = sg_dma_address(sg);
		*buf = (u32)scb->dma_h_bulkdata;
		*len = sg_dma_len(sg);
		return 0;
		}

		scsi_for_each_sg(cmd, sg, sgcnt, idx) {
		if (adapter->has_64bit_addr) {
		scb->sgl64[idx].address = sg_dma_address(sg);