Merge branch 'fixes' into next (56cbb3dd) · Commits · e / devices / android_kernel_teracube_2e

drivers/dma/amba-pl08x.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1433,6 +1433,7 @@ static int pl08x_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
		* signal
		*/
		release_phy_channel(plchan);
		plchan->phychan_hold = 0;
		}
		/* Dequeue jobs and free LLIs */
		if (plchan->at) {

drivers/dma/pl330.c

+15 −10

Original line number	Diff line number	Diff line
		@@ -2225,12 +2225,9 @@ static inline void free_desc_list(struct list_head *list)
		{
		struct dma_pl330_dmac *pdmac;
		struct dma_pl330_desc *desc;
		struct dma_pl330_chan *pch;
		struct dma_pl330_chan *pch = NULL;
		unsigned long flags;

		if (list_empty(list))
		return;

		/* Finish off the work list */
		list_for_each_entry(desc, list, node) {
		dma_async_tx_callback callback;
		@@ -2247,6 +2244,10 @@ static inline void free_desc_list(struct list_head *list)
		desc->pchan = NULL;
		}

		/* pch will be unset if list was empty */
		if (!pch)
		return;

		pdmac = pch->dmac;

		spin_lock_irqsave(&pdmac->pool_lock, flags);
		@@ -2257,12 +2258,9 @@ static inline void free_desc_list(struct list_head *list)
		static inline void handle_cyclic_desc_list(struct list_head *list)
		{
		struct dma_pl330_desc *desc;
		struct dma_pl330_chan *pch;
		struct dma_pl330_chan *pch = NULL;
		unsigned long flags;

		if (list_empty(list))
		return;

		list_for_each_entry(desc, list, node) {
		dma_async_tx_callback callback;

		@@ -2274,6 +2272,10 @@ static inline void handle_cyclic_desc_list(struct list_head *list)
		callback(desc->txd.callback_param);
		}

		/* pch will be unset if list was empty */
		if (!pch)
		return;

		spin_lock_irqsave(&pch->lock, flags);
		list_splice_tail_init(list, &pch->work_list);
		spin_unlock_irqrestore(&pch->lock, flags);
		@@ -2926,8 +2928,11 @@ pl330_probe(struct amba_device adev, const struct amba_id id)
		INIT_LIST_HEAD(&pd->channels);

		/* Initialize channel parameters */
		num_chan = max(pdat ? pdat->nr_valid_peri : (u8)pi->pcfg.num_peri,
		(u8)pi->pcfg.num_chan);
		if (pdat)
		num_chan = max_t(int, pdat->nr_valid_peri, pi->pcfg.num_chan);
		else
		num_chan = max_t(int, pi->pcfg.num_peri, pi->pcfg.num_chan);

		pdmac->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL);

		for (i = 0; i < num_chan; i++) {