UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'topic/coh' into for-linus

This commit is contained in:
Vinod Koul 2018-12-31 19:31:25 +05:30
parent 7c2269e958 35faaf0df4
commit 5f443256e3
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/dma/coh901318.c
View File

@ -1802,13 +1802,10 @@ static struct dma_chan *coh901318_xlate(struct of_phandle_args *dma_spec,
static int coh901318_config(struct coh901318_chan *cohc, static int coh901318_config(struct coh901318_chan *cohc,
struct coh901318_params *param) struct coh901318_params *param)
{ {
unsigned long flags;
const struct coh901318_params *p; const struct coh901318_params *p;
int channel = cohc->id; int channel = cohc->id;
void __iomem *virtbase = cohc->base->virtbase; void __iomem *virtbase = cohc->base->virtbase;
spin_lock_irqsave(&cohc->lock, flags);
if (param) if (param)
p = param; p = param;
else else
@ -1828,8 +1825,6 @@ static int coh901318_config(struct coh901318_chan *cohc,
coh901318_set_conf(cohc, p->config); coh901318_set_conf(cohc, p->config);
coh901318_set_ctrl(cohc, p->ctrl_lli_last); coh901318_set_ctrl(cohc, p->ctrl_lli_last);
spin_unlock_irqrestore(&cohc->lock, flags);
return 0; return 0;
} }