Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29274601 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/tegra' into for-linus

parents b9fbc96d 7b0e00d9

drivers/dma/tegra20-apb-dma.c

+5 −7
Original line number Diff line number Diff line
@@ -902,7 +902,6 @@ static int get_transfer_param(struct tegra_dma_channel *tdc, 
	unsigned long *apb_seq,	unsigned long *csr, unsigned int *burst_size,

	enum dma_slave_buswidth *slave_bw)

{



	switch (direction) {

	case DMA_MEM_TO_DEV:

		*apb_addr = tdc->dma_sconfig.dst_addr;
@@ -1201,7 +1200,6 @@ static void tegra_dma_free_chan_resources(struct dma_chan *dc) 
{

	struct tegra_dma_channel *tdc = to_tegra_dma_chan(dc);

	struct tegra_dma *tdma = tdc->tdma;



	struct tegra_dma_desc *dma_desc;

	struct tegra_dma_sg_req *sg_req;

	struct list_head dma_desc_list;