aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2015-12-04 11:32:21 -0800
committerAmit Pundir <amit.pundir@linaro.org>2016-01-11 09:50:29 +0530
commit16778e73045e8c8f4852de4ed565427d2483a329 (patch)
treeb8531d7b13fe9463a1d1563e3c27898036ecb6e4
parent63f7334e20a649f541d9f6ac67ed5251ee80fb8c (diff)
downloadlinaro-android-16778e73045e8c8f4852de4ed565427d2483a329.tar.gz
fiq_debugger: Build fixes for 4.1
Small build updates for 4.1 Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--drivers/staging/android/fiq_debugger/fiq_debugger.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/android/fiq_debugger/fiq_debugger.c b/drivers/staging/android/fiq_debugger/fiq_debugger.c
index 7d6b4ae8a2cd..7f056831dbff 100644
--- a/drivers/staging/android/fiq_debugger/fiq_debugger.c
+++ b/drivers/staging/android/fiq_debugger/fiq_debugger.c
@@ -517,7 +517,7 @@ static bool fiq_debugger_fiq_exec(struct fiq_debugger_state *state,
fiq_debugger_printf(&state->output, "cpu %d\n", state->current_cpu);
} else if (!strncmp(cmd, "cpu ", 4)) {
unsigned long cpu = 0;
- if (strict_strtoul(cmd + 4, 10, &cpu) == 0)
+ if (kstrtoul(cmd + 4, 10, &cpu) == 0)
fiq_debugger_switch_cpu(state, cpu);
else
fiq_debugger_printf(&state->output, "invalid cpu\n");
@@ -1144,7 +1144,7 @@ static int fiq_debugger_probe(struct platform_device *pdev)
if (state->wakeup_irq >= 0) {
ret = request_irq(state->wakeup_irq,
fiq_debugger_wakeup_irq_handler,
- IRQF_TRIGGER_FALLING | IRQF_DISABLED,
+ IRQF_TRIGGER_FALLING,
"debug-wakeup", state);
if (ret) {
pr_err("serial_debugger: "