Commit c8e57e1b authored by Ben Hutchings's avatar Ben Hutchings Committed by Mauro Carvalho Chehab
Browse files

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



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

Reported-by: default avatarTorsten Crass <torsten.crass@eBiology.de>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9105b8b2

drivers/staging/media/lirc/lirc_serial.c

+16 −3
Original line number Diff line number Diff line
@@ -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)