projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'io_uring-5.15-2021-09-11' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git]
/
drivers
/
dma
/
ep93xx_dma.c
diff --git
a/drivers/dma/ep93xx_dma.c
b/drivers/dma/ep93xx_dma.c
index
0102777
..
98f9ee7
100644
(file)
--- a/
drivers/dma/ep93xx_dma.c
+++ b/
drivers/dma/ep93xx_dma.c
@@
-897,7
+897,7
@@
static int ep93xx_dma_alloc_chan_resources(struct dma_chan *chan)
if (data && data->name)
name = data->name;
if (data && data->name)
name = data->name;
- ret = clk_enable(edmac->clk);
+ ret = clk_
prepare_
enable(edmac->clk);
if (ret)
return ret;
if (ret)
return ret;
@@
-936,7
+936,7
@@
static int ep93xx_dma_alloc_chan_resources(struct dma_chan *chan)
fail_free_irq:
free_irq(edmac->irq, edmac);
fail_clk_disable:
fail_free_irq:
free_irq(edmac->irq, edmac);
fail_clk_disable:
- clk_disable(edmac->clk);
+ clk_disable
_unprepare
(edmac->clk);
return ret;
}
return ret;
}
@@
-969,7
+969,7
@@
static void ep93xx_dma_free_chan_resources(struct dma_chan *chan)
list_for_each_entry_safe(desc, d, &list, node)
kfree(desc);
list_for_each_entry_safe(desc, d, &list, node)
kfree(desc);
- clk_disable(edmac->clk);
+ clk_disable
_unprepare
(edmac->clk);
free_irq(edmac->irq, edmac);
}
free_irq(edmac->irq, edmac);
}