The patch titled arch/cris: add a missing iounmap has been removed from the -mm tree. Its filename was arch-cris-added-a-missing-iounmap.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: arch/cris: add a missing iounmap From: Julia Lawall <julia@xxxxxxx> An extra error handling label is needed for the case where the ioremap has succeeded. The problem was detected using the following semantic match (http://www.emn.fr/x-info/coccinelle/) // <smpl> @@ type T,T1,T2; identifier E; statement S; expression x1,x2; constant C; int ret; @@ T E; ... * E = ioremap(...); if (E == NULL) S ... when != iounmap(E) when != if (E != NULL) { ... iounmap(E); ...} when != x1 = (T1)E if (...) { ... when != iounmap(E) when != if (E != NULL) { ... iounmap(E); ...} when != x2 = (T2)E ( * return; | * return C; | * return ret; ) } // </smpl> Signed-off-by: Julia Lawall <julia@xxxxxxx> Cc: Mikael Starvik <starvik@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/cris/arch-v32/drivers/pci/dma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff -puN arch/cris/arch-v32/drivers/pci/dma.c~arch-cris-added-a-missing-iounmap arch/cris/arch-v32/drivers/pci/dma.c --- a/arch/cris/arch-v32/drivers/pci/dma.c~arch-cris-added-a-missing-iounmap +++ a/arch/cris/arch-v32/drivers/pci/dma.c @@ -93,7 +93,7 @@ int dma_declare_coherent_memory(struct d 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 d free1_out: kfree(dev->dma_mem); + iounmap_out: + iounmap(mem_base); out: return 0; } _ Patches currently in -mm which might be from julia@xxxxxxx are origin.patch drivers-cpufreq-add-calls-to-cpufreq_cpu_put.patch arch-powerpc-platforms-pseries-add-missing-of_node_put.patch arch-powerpc-sysdev-add-missing-of_node_put.patch arch-powerpc-platforms-82xx-add-missing-of_node_put.patch git-input.patch git-mtd.patch drivers-video-remove-unnecessary-pci_dev_put.patch drivers-video-add-missing-pci_dev_get.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html