diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 14:27:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 14:27:18 -0700 |
| commit | b22793f7fdc38d73c4bb4299a313deef56dcfe66 (patch) | |
| tree | 16cfdb64875d4e687daaa5a25440d80f719c2c1d /drivers/serial | |
| parent | b65378898c2eefb20f419632c1199bc0592e2f79 (diff) | |
| parent | c0f37d2ac34520e992b57115b81294734688b58d (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Cannot use register_percpu_irq() from ia64_mca_init()
[IA64] Initialize interrupts later (from init_IRQ())
[IA64] enable ARCH_DMA_ADDR_T_64BIT
[IA64] ioc3_serial: release resources in error return path
[IA64] Stop using the deprecated __do_IRQ() code path
[IA64] Remove unnecessary casts of private_data in perfmon.c
[IA64] Fix missing iounmap in error path in cyclone.c
[IA64] salinfo: sema_init instead of init_MUTEX
[IA64] xen: use ARRAY_SIZE macro in xen_pv_ops.c
[IA64] Use static const char * const in palinfo.c
[IA64] remove asm/compat.h
[IA64] Add CONFIG_STACKTRACE_SUPPORT
[IA64] Move local_softirq_pending() definition
[IA64] iommu: Add a dummy iommu_table.h file in IA64.
[IA64] unwind - optimise linked-list searches for modules
[IA64] unwind: remove preprocesser noise, and correct comment
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/ioc3_serial.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c index 800c54602339..ee43efc7bdcc 100644 --- a/drivers/serial/ioc3_serial.c +++ b/drivers/serial/ioc3_serial.c @@ -2017,6 +2017,7 @@ ioc3uart_probe(struct ioc3_submodule *is, struct ioc3_driver_data *idd) struct ioc3_port *port; struct ioc3_port *ports[PORTS_PER_CARD]; int phys_port; + int cnt; DPRINT_CONFIG(("%s (0x%p, 0x%p)\n", __func__, is, idd)); @@ -2147,6 +2148,9 @@ ioc3uart_probe(struct ioc3_submodule *is, struct ioc3_driver_data *idd) /* error exits that give back resources */ out4: + for (cnt = 0; cnt < phys_port; cnt++) + kfree(ports[cnt]); + kfree(card_ptr); return ret; } |