Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[media] staging: lirc_serial: Free resources on failure paths of lirc_serial_probe()

Browse source 
Failure to allocate the I/O region leaves the IRQ allocated.
A later failure leaves them both allocated.

Reported-by: Torsten Crass <torsten.crass@eBiology.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Ben Hutchings 2011-11-16 01:52:11 -03:00 • committed by Mauro Carvalho Chehab
parent 9105b8b200
commit c8e57e1b76
1 changed files with 16 additions and 3 deletions

19
drivers/staging/media/lirc/lirc_serial.c
View file

@ -875,11 +875,14 @@ static int __devinit lirc_serial_probe(struct platform_device *dev)
": or compile the serial port driver as module and\n");
printk(KERN_WARNING LIRC_DRIVER_NAME
": make sure this module is loaded first\n");
return -EBUSY;
result = -EBUSY;
goto exit_free_irq;
}
if (hardware_init_port() < 0)
return -EINVAL;
if (hardware_init_port() < 0) {
result = -EINVAL;
goto exit_release_region;
}
/* Initialize pulse/space widths */
init_timing_params(duty_cycle, freq);
@ -911,6 +914,16 @@ static int __devinit lirc_serial_probe(struct platform_device *dev)
dprintk("Interrupt %d, port %04x obtained\n", irq, io);
return 0;
exit_release_region:
if (iommap != 0)
release_mem_region(iommap, 8 << ioshift);
else
release_region(io, 8);
exit_free_irq:
free_irq(irq, (void *)&hardware);
return result;
}
static int __devexit lirc_serial_remove(struct platform_device *dev)