From 996203dd85bc886dcc8f16e914cdd14ba42a8a5d Mon Sep 17 00:00:00 2001 From: Amol Lad Date: Tue, 17 Oct 2006 10:02:50 +0530 Subject: [PATCH] --- yaml --- r: 41223 b: refs/heads/master c: 039d09a845209122c5193e650ab2d8b3c849ca7c h: refs/heads/master i: 41221: 7238cb17365cf08dead8d1aad89f857dd21de58e 41219: 90fea0e87308a4fae4ecf5db781280abdbcc0441 41215: a7d6345be37d5de5deb4e758515d4f7b7975d42c v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/pci-dma.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 404be4db1e24..c2e3a012080e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7edab2f0876ff6a38e10a88c9aca20180aad307c +refs/heads/master: 039d09a845209122c5193e650ab2d8b3c849ca7c diff --git a/trunk/arch/i386/kernel/pci-dma.c b/trunk/arch/i386/kernel/pci-dma.c index 25fe66853934..5c8c6ef1fc5e 100644 --- a/trunk/arch/i386/kernel/pci-dma.c +++ b/trunk/arch/i386/kernel/pci-dma.c @@ -75,7 +75,7 @@ EXPORT_SYMBOL(dma_free_coherent); int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr, dma_addr_t device_addr, size_t size, int flags) { - void __iomem *mem_base; + void __iomem *mem_base = NULL; int pages = size >> PAGE_SHIFT; int bitmap_size = (pages + 31)/32; @@ -114,6 +114,8 @@ int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr, free1_out: kfree(dev->dma_mem->bitmap); out: + if (mem_base) + iounmap(mem_base); return 0; } EXPORT_SYMBOL(dma_declare_coherent_memory);