AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-02-08 18:15:17 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'timb' into dmaengine

Browse Source
This commit is contained in:
Dan Williams 2010-07-01 02:29:19 -07:00
commit 084a2ab9c2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/dma/timb_dma.c
View File

@ -200,8 +200,8 @@ static int td_fill_desc(struct timb_dma_chan *td_chan, u8 *dma_desc,
return -EINVAL; return -EINVAL;
} }
dev_dbg(chan2dev(&td_chan->chan), "desc: %p, addr: %p\n", dev_dbg(chan2dev(&td_chan->chan), "desc: %p, addr: 0x%llx\n",
dma_desc, (void *)sg_dma_address(sg)); dma_desc, (unsigned long long)sg_dma_address(sg));
dma_desc[7] = (sg_dma_address(sg) >> 24) & 0xff; dma_desc[7] = (sg_dma_address(sg) >> 24) & 0xff;
dma_desc[6] = (sg_dma_address(sg) >> 16) & 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); td_desc = kzalloc(sizeof(struct timb_dma_desc), GFP_KERNEL);
if (!td_desc) { if (!td_desc) {
dev_err(chan2dev(chan), "Failed to alloc descriptor\n"); 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; 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: err:
kfree(td_desc->desc_list); kfree(td_desc->desc_list);
kfree(td_desc); kfree(td_desc);
out:
return NULL; return NULL;
} }