Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	include/asm-x86/statfs.h

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c
index 529462c01570..79165122501c 100644
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
@@ -420,8 +420,10 @@ tioca_dma_mapped(struct pci_dev *pdev, u64 paddr, size_t req_size)
                 entry = find_next_zero_bit(map, mapsize, last_entry);
         }
 
-        if (entry > mapsize)
+        if (entry > mapsize) {
+                kfree(ca_dmamap);
                 goto map_return;
+        }
 
         for (i = 0; i < entries; i++)
                 set_bit(entry + i, map);