From 9dcfdb7e1562b8321c0c9240b702aad4cf8ece53 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Mon, 4 Feb 2008 22:30:32 -0800 Subject: [PATCH] --- yaml --- r: 83155 b: refs/heads/master c: 6d9f4c5cfb6084c16a800e8a2ca9db8d0859611c h: refs/heads/master i: 83153: 1b48b00d474f6ee98bc9e4e6eb90dab5ab757b72 83151: 0eda42228666e3a51cf469e1a1030258ca2129ae v: v3 --- [refs] | 2 +- trunk/arch/cris/arch-v32/drivers/pci/dma.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4d41d22a3124..3e0c372a9b87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d33d563b1e2b4748c585e3169f46481e897c829 +refs/heads/master: 6d9f4c5cfb6084c16a800e8a2ca9db8d0859611c diff --git a/trunk/arch/cris/arch-v32/drivers/pci/dma.c b/trunk/arch/cris/arch-v32/drivers/pci/dma.c index 66f9500fbc02..e0364654fc44 100644 --- a/trunk/arch/cris/arch-v32/drivers/pci/dma.c +++ b/trunk/arch/cris/arch-v32/drivers/pci/dma.c @@ -93,7 +93,7 @@ int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr, dev->dma_mem = kzalloc(sizeof(struct dma_coherent_mem), GFP_KERNEL); if (!dev->dma_mem) - goto out; + goto iounmap_out; dev->dma_mem->bitmap = kzalloc(bitmap_size, GFP_KERNEL); if (!dev->dma_mem->bitmap) goto free1_out; @@ -110,6 +110,8 @@ int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr, free1_out: kfree(dev->dma_mem); + iounmap_out: + iounmap(mem_base); out: return 0; }