renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-17 09:43:59 +08:00
Code

mtd: mxc_nand: fix unbalanced clk_disable() in error path

Browse Source 
If nand_scan_ident() or nand_scan_tail() fails, the NAND chip may have
been deselected and the clock already disabled. Thus, check 'clk_act'
in the error path to decide whether the clock still needs to be
disabled.

This fixes a:
|WARNING: at drivers/clk/clk.c:472 __clk_disable+0x3c/0x78()

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
This commit is contained in:
Lothar Waßmann 2012-12-06 08:42:27 +01:00 committed by Artem Bityutskiy
parent 5346c27c5f
commit c10d8ee3fe
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/mtd/nand/mxc_nand.c
View File

@ -1533,7 +1533,8 @@ static int mxcnd_probe(struct platform_device *pdev)
return 0;
escan:
clk_disable_unprepare(host->clk);
if (host->clk_act)
clk_disable_unprepare(host->clk);
return err;
}