Skip to content

Commit

Permalink
dma: mv_xor: fix error handling for clocks
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
tpetazzoni authored and Jason Cooper committed Jan 6, 2013
1 parent ab6e439 commit dab9206
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/dma/mv_xor.c
Expand Up @@ -1366,8 +1366,11 @@ static int mv_xor_probe(struct platform_device *pdev)
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;
}

Expand Down

0 comments on commit dab9206

Please sign in to comment.