60 lines
1.8 KiB
Diff
60 lines
1.8 KiB
Diff
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Wed, 16 Nov 2011 01:52:11 -0300
|
|
Subject: [PATCH 2/5] [media] staging: lirc_serial: Free resources on failure
|
|
paths of lirc_serial_probe()
|
|
|
|
commit c8e57e1b766c2321aa76ee5e6878c69bd2313d62 upstream.
|
|
|
|
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>
|
|
---
|
|
drivers/staging/media/lirc/lirc_serial.c | 19 ++++++++++++++++---
|
|
1 files changed, 16 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
|
|
index 8637631..d833772 100644
|
|
--- a/drivers/staging/media/lirc/lirc_serial.c
|
|
+++ b/drivers/staging/media/lirc/lirc_serial.c
|
|
@@ -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)
|
|
--
|
|
1.7.7.3
|
|
|