diff options
author | Florian Fainelli <florian@openwrt.org> | 2013-01-10 17:20:25 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2013-01-10 17:20:25 +0000 |
commit | ecf230710f51a442d2bb1b59d43cd6f7335a8e92 (patch) | |
tree | 04d582337930d944d9cd9f54675ccedaa2f93317 /target/linux/mvebu/patches-3.8/003-dma_mv_xor_fix_error_handling_clocks.patch | |
parent | 548cb598269e2e8d981110cd1082dcb4e967c6bd (diff) | |
download | upstream-ecf230710f51a442d2bb1b59d43cd6f7335a8e92.tar.gz upstream-ecf230710f51a442d2bb1b59d43cd6f7335a8e92.tar.bz2 upstream-ecf230710f51a442d2bb1b59d43cd6f7335a8e92.zip |
mvebu: update to 3.8-rc3
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 35086
Diffstat (limited to 'target/linux/mvebu/patches-3.8/003-dma_mv_xor_fix_error_handling_clocks.patch')
-rw-r--r-- | target/linux/mvebu/patches-3.8/003-dma_mv_xor_fix_error_handling_clocks.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/target/linux/mvebu/patches-3.8/003-dma_mv_xor_fix_error_handling_clocks.patch b/target/linux/mvebu/patches-3.8/003-dma_mv_xor_fix_error_handling_clocks.patch deleted file mode 100644 index 9bee8acded..0000000000 --- a/target/linux/mvebu/patches-3.8/003-dma_mv_xor_fix_error_handling_clocks.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - -When a channel fails to initialize, we release all ressources, -including clocks. However, a XOR unit is not necessarily associated to -a clock (some variants of Marvell SoCs have a clock for XOR units, -some don't), so we shouldn't unconditionally be releasing the clock. - -Instead, just like we do in the mv_xor_remove() function, we should -check if one clock was found before releasing it. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> ---- - drivers/dma/mv_xor.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c -index cc5d23d..e17fad0 100644 ---- a/drivers/dma/mv_xor.c -+++ b/drivers/dma/mv_xor.c -@@ -1366,8 +1366,11 @@ err_channel_add: - irq_dispose_mapping(xordev->channels[i]->irq); - } - -- clk_disable_unprepare(xordev->clk); -- clk_put(xordev->clk); -+ if (!IS_ERR(xordev->clk)) { -+ clk_disable_unprepare(xordev->clk); -+ clk_put(xordev->clk); -+ } -+ - return ret; - } - --- -1.7.10.4 |