diff options
Diffstat (limited to 'drivers/char/agp/amd-k7-agp.c')
-rw-r--r-- | drivers/char/agp/amd-k7-agp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c index 3a41672e4d66..40fcd88b2cea 100644 --- a/drivers/char/agp/amd-k7-agp.c +++ b/drivers/char/agp/amd-k7-agp.c | |||
@@ -94,19 +94,16 @@ static int amd_create_gatt_pages(int nr_tables) | |||
94 | int retval = 0; | 94 | int retval = 0; |
95 | int i; | 95 | int i; |
96 | 96 | ||
97 | tables = kmalloc((nr_tables + 1) * sizeof(struct amd_page_map *), | 97 | tables = kzalloc((nr_tables + 1) * sizeof(struct amd_page_map *),GFP_KERNEL); |
98 | GFP_KERNEL); | ||
99 | if (tables == NULL) | 98 | if (tables == NULL) |
100 | return -ENOMEM; | 99 | return -ENOMEM; |
101 | 100 | ||
102 | memset (tables, 0, sizeof(struct amd_page_map *) * (nr_tables + 1)); | ||
103 | for (i = 0; i < nr_tables; i++) { | 101 | for (i = 0; i < nr_tables; i++) { |
104 | entry = kmalloc(sizeof(struct amd_page_map), GFP_KERNEL); | 102 | entry = kzalloc(sizeof(struct amd_page_map), GFP_KERNEL); |
105 | if (entry == NULL) { | 103 | if (entry == NULL) { |
106 | retval = -ENOMEM; | 104 | retval = -ENOMEM; |
107 | break; | 105 | break; |
108 | } | 106 | } |
109 | memset (entry, 0, sizeof(struct amd_page_map)); | ||
110 | tables[i] = entry; | 107 | tables[i] = entry; |
111 | retval = amd_create_page_map(entry); | 108 | retval = amd_create_page_map(entry); |
112 | if (retval != 0) | 109 | if (retval != 0) |
@@ -518,6 +515,7 @@ static struct pci_device_id agp_amdk7_pci_table[] = { | |||
518 | MODULE_DEVICE_TABLE(pci, agp_amdk7_pci_table); | 515 | MODULE_DEVICE_TABLE(pci, agp_amdk7_pci_table); |
519 | 516 | ||
520 | static struct pci_driver agp_amdk7_pci_driver = { | 517 | static struct pci_driver agp_amdk7_pci_driver = { |
518 | .owner = THIS_MODULE, | ||
521 | .name = "agpgart-amdk7", | 519 | .name = "agpgart-amdk7", |
522 | .id_table = agp_amdk7_pci_table, | 520 | .id_table = agp_amdk7_pci_table, |
523 | .probe = agp_amdk7_probe, | 521 | .probe = agp_amdk7_probe, |