summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorSean Young <sean@mess.org>2017-03-25 08:45:38 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-04-05 14:50:15 -0300
commit8c7c6cad6aee5013694120a2b2907c530c08a245 (patch)
tree244b24cbd1acd8171b79337175df67c90d0cbb27 /drivers
parent4d7cf7ec84a84b4950d8fb36c627771d38058300 (diff)
[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 <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/media/lirc/lirc_sir.c4
1 files 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;
}