diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 13:26:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 13:26:58 -0800 |
| commit | 7079060f3e86ea4c1d4e9c1e356592ef9dcaaa1f (patch) | |
| tree | d56af89cd433440e3b9c94a830838d34b502e446 /drivers/char/agp/i460-agp.c | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
| parent | 0a1cc0b6a4abaed5f891d1be3e3d0d7b9b719287 (diff) | |
| download | blackbird-op-linux-7079060f3e86ea4c1d4e9c1e356592ef9dcaaa1f.tar.gz blackbird-op-linux-7079060f3e86ea4c1d4e9c1e356592ef9dcaaa1f.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
Diffstat (limited to 'drivers/char/agp/i460-agp.c')
| -rw-r--r-- | drivers/char/agp/i460-agp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c index a2d9e5e48bbe..58944cd271ea 100644 --- a/drivers/char/agp/i460-agp.c +++ b/drivers/char/agp/i460-agp.c @@ -227,10 +227,9 @@ static int i460_configure (void) */ if (I460_IO_PAGE_SHIFT > PAGE_SHIFT) { size = current_size->num_entries * sizeof(i460.lp_desc[0]); - i460.lp_desc = kmalloc(size, GFP_KERNEL); + i460.lp_desc = kzalloc(size, GFP_KERNEL); if (!i460.lp_desc) return -ENOMEM; - memset(i460.lp_desc, 0, size); } return 0; } @@ -366,13 +365,12 @@ static int i460_alloc_large_page (struct lp_desc *lp) } map_size = ((I460_KPAGES_PER_IOPAGE + BITS_PER_LONG - 1) & -BITS_PER_LONG)/8; - lp->alloced_map = kmalloc(map_size, GFP_KERNEL); + lp->alloced_map = kzalloc(map_size, GFP_KERNEL); if (!lp->alloced_map) { free_pages((unsigned long) lpage, order); printk(KERN_ERR PFX "Out of memory, we're in trouble...\n"); return -ENOMEM; } - memset(lp->alloced_map, 0, map_size); lp->paddr = virt_to_gart(lpage); lp->refcount = 0; @@ -619,6 +617,7 @@ static struct pci_device_id agp_intel_i460_pci_table[] = { MODULE_DEVICE_TABLE(pci, agp_intel_i460_pci_table); static struct pci_driver agp_intel_i460_pci_driver = { + .owner = THIS_MODULE, .name = "agpgart-intel-i460", .id_table = agp_intel_i460_pci_table, .probe = agp_intel_i460_probe, |
