From 8c7c6cad6aee5013694120a2b2907c530c08a245 Mon Sep 17 00:00:00 2001 From: Sean Young Date: Sat, 25 Mar 2017 08:45:38 -0300 Subject: [PATCH] [media] staging: sir: make sure we are ready to receive interrupts Ensure that the timer is ready before we request interrupts. Signed-off-by: Sean Young Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/media/lirc/lirc_sir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/lirc/lirc_sir.c b/drivers/staging/media/lirc/lirc_sir.c index 181ac632afe3..e12ec50bf0bf 100644 --- a/drivers/staging/media/lirc/lirc_sir.c +++ b/drivers/staging/media/lirc/lirc_sir.c @@ -325,6 +325,8 @@ static int init_port(void) { int retval; + setup_timer(&timerlist, sir_timeout, 0); + /* get I/O port access and IRQ line */ if (!request_region(io, 8, KBUILD_MODNAME)) { pr_err("i/o port 0x%.4x already in use.\n", io); @@ -339,8 +341,6 @@ static int init_port(void) } pr_info("I/O port 0x%.4x, IRQ %d.\n", io, irq); - setup_timer(&timerlist, sir_timeout, 0); - return 0; }