diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 08:09:09 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 08:09:09 -0700 |
| commit | 0ccd8c39bc664bf5e9fcc26caad50cc17ff866d1 (patch) | |
| tree | 29cec0edf3acf18c6978b750a8d6560f445df6df /arch/powerpc/sysdev/qe_lib/ucc_fast.c | |
| parent | 1625324d22409e32e3f8eb86018cad72e1c09d61 (diff) | |
| parent | ec0c15afb41fd9ad45b53468b60db50170e22346 (diff) | |
Merge branch 'linus' into x86/core
Diffstat (limited to 'arch/powerpc/sysdev/qe_lib/ucc_fast.c')
| -rw-r--r-- | arch/powerpc/sysdev/qe_lib/ucc_fast.c | 4 |
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 1aecb075a72e..25fbbfaa837d 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); |