summaryrefslogtreecommitdiff
path: root/arch/arm/common
diff options
context:
space:
mode:
authorDima Zavin <dima@android.com>2011-10-20 14:48:37 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:39:13 -0800
commitc45e9b96a7734f065ed3237855e88a509cc34358 (patch)
treeeb6e3411fce85344de8ff00bd21c317d602e4976 /arch/arm/common
parentee4afb6a61624628c9080c18bcdfe79be72d1667 (diff)
ARM: common: fiq_debugger: fix the cleanup on errors in probe
Change-Id: I58bd0604c0520b13e11bf02836eb4ddbadba1372 Signed-off-by: Dima Zavin <dima@android.com>
Diffstat (limited to 'arch/arm/common')
-rw-r--r--arch/arm/common/fiq_debugger.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/common/fiq_debugger.c b/arch/arm/common/fiq_debugger.c
index d44690dae546..46bf7af88ff9 100644
--- a/arch/arm/common/fiq_debugger.c
+++ b/arch/arm/common/fiq_debugger.c
@@ -923,9 +923,12 @@ err_register_fiq:
if (pdata->uart_free)
pdata->uart_free(pdev);
err_uart_init:
- kfree(state);
+ if (state->clk)
+ clk_disable(state->clk);
if (state->clk)
clk_put(state->clk);
+ wake_lock_destroy(&state->debugger_wake_lock);
+ kfree(state);
return ret;
}