diff options
author | Burman Yan <yan_952@hotmail.com> | 2006-12-06 20:14:19 -0500 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-12-06 20:14:19 -0500 |
commit | 116780fc04d9f6cd3ceeab0251681f1dfda53367 (patch) | |
tree | d28148b520fa9ed8e7ea7d6e067c95cee4a42078 /arch/i386/kernel/pci-dma.c | |
parent | d7fb02712818643bab79a6b3cb8270a747d0227b (diff) |
[PATCH] i386: replace kmalloc+memset with kzalloc
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/i386/kernel/pci-dma.c')
-rw-r--r-- | arch/i386/kernel/pci-dma.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/i386/kernel/pci-dma.c b/arch/i386/kernel/pci-dma.c index 5c8c6ef1fc5e..41af692c1584 100644 --- a/arch/i386/kernel/pci-dma.c +++ b/arch/i386/kernel/pci-dma.c | |||
@@ -92,14 +92,12 @@ int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr, | |||
92 | if (!mem_base) | 92 | if (!mem_base) |
93 | goto out; | 93 | goto out; |
94 | 94 | ||
95 | dev->dma_mem = kmalloc(sizeof(struct dma_coherent_mem), GFP_KERNEL); | 95 | dev->dma_mem = kzalloc(sizeof(struct dma_coherent_mem), GFP_KERNEL); |
96 | if (!dev->dma_mem) | 96 | if (!dev->dma_mem) |
97 | goto out; | 97 | goto out; |
98 | memset(dev->dma_mem, 0, sizeof(struct dma_coherent_mem)); | 98 | dev->dma_mem->bitmap = kzalloc(bitmap_size, GFP_KERNEL); |
99 | dev->dma_mem->bitmap = kmalloc(bitmap_size, GFP_KERNEL); | ||
100 | if (!dev->dma_mem->bitmap) | 99 | if (!dev->dma_mem->bitmap) |
101 | goto free1_out; | 100 | goto free1_out; |
102 | memset(dev->dma_mem->bitmap, 0, bitmap_size); | ||
103 | 101 | ||
104 | dev->dma_mem->virt_base = mem_base; | 102 | dev->dma_mem->virt_base = mem_base; |
105 | dev->dma_mem->device_base = device_addr; | 103 | dev->dma_mem->device_base = device_addr; |