diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-01-06 14:10:44 +0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-01-06 21:53:28 +0400 |
| commit | dab9206445952e64213582b2ab9077972850d65b (patch) | |
| tree | 92fe891f1fdcca9882523aa615fcdb809c3dc3b4 /drivers/dma | |
| parent | ab6e439fd07aba7cadcadb3fb5e11d3758e19679 (diff) | |
| download | linux-dab9206445952e64213582b2ab9077972850d65b.tar.xz | |
dma: mv_xor: fix error handling for clocks
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>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/mv_xor.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index cc5d23d3addd..e17fad03cb80 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; } |