hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[media] sir_ir: use dev managed resources 

Several error paths do not free up resources. This simplifies the code
and fixes this.

Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Sean Young 2017-05-17 14:32:51 -03:00 committed by Mauro Carvalho Chehab
parent 1beb5a7d1b
commit b462e1b20d
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/rc/sir_ir.c
View File

@ -334,14 +334,13 @@ static int init_port(void)
setup_timer(&timerlist, sir_timeout, 0);
/* get I/O port access and IRQ line */
if (!request_region(io, 8, KBUILD_MODNAME)) {
if (!devm_request_region(&sir_ir_dev->dev, io, 8, KBUILD_MODNAME)) {
pr_err("i/o port 0x%.4x already in use.\n", io);
return -EBUSY;
}
retval = request_irq(irq, sir_interrupt, 0,
KBUILD_MODNAME, NULL);
retval = devm_request_irq(&sir_ir_dev->dev, irq, sir_interrupt, 0,
KBUILD_MODNAME, NULL);
if (retval < 0) {
release_region(io, 8);
pr_err("IRQ %d already in use.\n", irq);
return retval;
}
@ -352,9 +351,7 @@ static int init_port(void)
static void drop_port(void)
{
free_irq(irq, NULL);
del_timer_sync(&timerlist);
release_region(io, 8);
}
static int init_sir_ir(void)