Merge branch 'timb' into dmaengine (084a2ab9) · Commits · e / devices / android_kernel_teracube_emerald

drivers/dma/timb_dma.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -200,8 +200,8 @@ static int td_fill_desc(struct timb_dma_chan td_chan, u8 dma_desc,
		return -EINVAL;
		}

		dev_dbg(chan2dev(&td_chan->chan), "desc: %p, addr: %p\n",
		dma_desc, (void *)sg_dma_address(sg));
		dev_dbg(chan2dev(&td_chan->chan), "desc: %p, addr: 0x%llx\n",
		dma_desc, (unsigned long long)sg_dma_address(sg));

		dma_desc[7] = (sg_dma_address(sg) >> 24) & 0xff;
		dma_desc[6] = (sg_dma_address(sg) >> 16) & 0xff;
		@@ -382,7 +382,7 @@ static struct timb_dma_desc td_alloc_init_desc(struct timb_dma_chan td_chan)
		td_desc = kzalloc(sizeof(struct timb_dma_desc), GFP_KERNEL);
		if (!td_desc) {
		dev_err(chan2dev(chan), "Failed to alloc descriptor\n");
		goto err;
		goto out;
		}

		td_desc->desc_list_len = td_chan->desc_elems * TIMB_DMA_DESC_SIZE;
		@@ -410,7 +410,7 @@ static struct timb_dma_desc td_alloc_init_desc(struct timb_dma_chan td_chan)
		err:
		kfree(td_desc->desc_list);
		kfree(td_desc);

		out:
		return NULL;

		}