aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/sysdev/qe_lib/ucc_fast.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2008-08-28 02:47:00 +0000
committerSteve French <sfrench@us.ibm.com>2008-08-28 02:47:00 +0000
commit6405c9cd9bf7b1c35ed76ef8ee3e217056285702 (patch)
tree0659c9ae17d1375f185f88f4f7fef1a667f375d8 /arch/powerpc/sysdev/qe_lib/ucc_fast.c
parentbcc55c6664a90146149ba0fd93052adc94287b9f (diff)
parent4c246edd2550304df5b766cc841584b2bb058843 (diff)
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/powerpc/sysdev/qe_lib/ucc_fast.c')
-rw-r--r--arch/powerpc/sysdev/qe_lib/ucc_fast.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/qe_lib/ucc_fast.c b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
index 1aecb075a72..25fbbfaa837 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc_fast.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
@@ -208,6 +208,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
uccf->uf_regs = ioremap(uf_info->regs, sizeof(struct ucc_fast));
if (uccf->uf_regs == NULL) {
printk(KERN_ERR "%s: Cannot map UCC registers\n", __func__);
+ kfree(uccf);
return -ENOMEM;
}
@@ -355,6 +356,9 @@ void ucc_fast_free(struct ucc_fast_private * uccf)
if (uccf->ucc_fast_rx_virtual_fifo_base_offset)
qe_muram_free(uccf->ucc_fast_rx_virtual_fifo_base_offset);
+ if (uccf->uf_regs)
+ iounmap(uccf->uf_regs);
+
kfree(uccf);
}
EXPORT_SYMBOL(ucc_fast_free);