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/ati-agp.c | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
| parent | 0a1cc0b6a4abaed5f891d1be3e3d0d7b9b719287 (diff) | |
| download | op-kernel-dev-7079060f3e86ea4c1d4e9c1e356592ef9dcaaa1f.zip op-kernel-dev-7079060f3e86ea4c1d4e9c1e356592ef9dcaaa1f.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
Diffstat (limited to 'drivers/char/agp/ati-agp.c')
| -rw-r--r-- | drivers/char/agp/ati-agp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c index 0b6e726..fbd4155 100644 --- a/drivers/char/agp/ati-agp.c +++ b/drivers/char/agp/ati-agp.c @@ -118,14 +118,12 @@ static int ati_create_gatt_pages(int nr_tables) int retval = 0; int i; - tables = kmalloc((nr_tables + 1) * sizeof(ati_page_map *), - GFP_KERNEL); + tables = kzalloc((nr_tables + 1) * sizeof(ati_page_map *),GFP_KERNEL); if (tables == NULL) return -ENOMEM; - memset(tables, 0, sizeof(ati_page_map *) * (nr_tables + 1)); for (i = 0; i < nr_tables; i++) { - entry = kmalloc(sizeof(ati_page_map), GFP_KERNEL); + entry = kzalloc(sizeof(ati_page_map), GFP_KERNEL); if (entry == NULL) { while (i>0) { kfree (tables[i-1]); @@ -136,7 +134,6 @@ static int ati_create_gatt_pages(int nr_tables) retval = -ENOMEM; break; } - memset(entry, 0, sizeof(ati_page_map)); tables[i] = entry; retval = ati_create_page_map(entry); if (retval != 0) break; @@ -524,6 +521,7 @@ static struct pci_device_id agp_ati_pci_table[] = { MODULE_DEVICE_TABLE(pci, agp_ati_pci_table); static struct pci_driver agp_ati_pci_driver = { + .owner = THIS_MODULE, .name = "agpgart-ati", .id_table = agp_ati_pci_table, .probe = agp_ati_probe, |
