diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 21:27:18 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 21:27:18 (GMT) |
| commit | b22793f7fdc38d73c4bb4299a313deef56dcfe66 (patch) | |
| tree | 16cfdb64875d4e687daaa5a25440d80f719c2c1d /arch/ia64/kernel/cyclone.c | |
| parent | b65378898c2eefb20f419632c1199bc0592e2f79 (diff) | |
| parent | c0f37d2ac34520e992b57115b81294734688b58d (diff) | |
| download | linux-fsl-qoriq-b22793f7fdc38d73c4bb4299a313deef56dcfe66.tar.xz | |
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 'arch/ia64/kernel/cyclone.c')
| -rw-r--r-- | arch/ia64/kernel/cyclone.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/cyclone.c b/arch/ia64/kernel/cyclone.c index 71e3586..d52f1f7 100644 --- a/arch/ia64/kernel/cyclone.c +++ b/arch/ia64/kernel/cyclone.c @@ -59,13 +59,13 @@ int __init init_cyclone_clock(void) return -ENODEV; } base = readq(reg); + iounmap(reg); if(!base){ printk(KERN_ERR "Summit chipset: Could not find valid CBAR" " value.\n"); use_cyclone = 0; return -ENODEV; } - iounmap(reg); /* setup PMCC */ offset = (base + CYCLONE_PMCC_OFFSET); |