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

Commit 5f443256 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/coh' into for-linus

parents 7c2269e9 35faaf0d

drivers/dma/coh901318.c

+0 −5
Original line number Diff line number Diff line
@@ -1802,13 +1802,10 @@ static struct dma_chan *coh901318_xlate(struct of_phandle_args *dma_spec, 
static int coh901318_config(struct coh901318_chan *cohc,

			    struct coh901318_params *param)

{

	unsigned long flags;

	const struct coh901318_params *p;

	int channel = cohc->id;

	void __iomem *virtbase = cohc->base->virtbase;



	spin_lock_irqsave(&cohc->lock, flags);



	if (param)

		p = param;

	else
@@ -1828,8 +1825,6 @@ static int coh901318_config(struct coh901318_chan *cohc, 
	coh901318_set_conf(cohc, p->config);

	coh901318_set_ctrl(cohc, p->ctrl_lli_last);



	spin_unlock_irqrestore(&cohc->lock, flags);



	return 0;

}