aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/agp/sworks-agp.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/agp/sworks-agp.c')
-rw-r--r--drivers/char/agp/sworks-agp.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index 53968973f890..161d22b67fa3 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -100,19 +100,17 @@ static int serverworks_create_gatt_pages(int nr_tables)
100 int retval = 0; 100 int retval = 0;
101 int i; 101 int i;
102 102
103 tables = kmalloc((nr_tables + 1) * sizeof(struct serverworks_page_map *), 103 tables = kzalloc((nr_tables + 1) * sizeof(struct serverworks_page_map *),
104 GFP_KERNEL); 104 GFP_KERNEL);
105 if (tables == NULL) { 105 if (tables == NULL)
106 return -ENOMEM; 106 return -ENOMEM;
107 } 107
108 memset(tables, 0, sizeof(struct serverworks_page_map *) * (nr_tables + 1));
109 for (i = 0; i < nr_tables; i++) { 108 for (i = 0; i < nr_tables; i++) {
110 entry = kmalloc(sizeof(struct serverworks_page_map), GFP_KERNEL); 109 entry = kzalloc(sizeof(struct serverworks_page_map), GFP_KERNEL);
111 if (entry == NULL) { 110 if (entry == NULL) {
112 retval = -ENOMEM; 111 retval = -ENOMEM;
113 break; 112 break;
114 } 113 }
115 memset(entry, 0, sizeof(struct serverworks_page_map));
116 tables[i] = entry; 114 tables[i] = entry;
117 retval = serverworks_create_page_map(entry); 115 retval = serverworks_create_page_map(entry);
118 if (retval != 0) break; 116 if (retval != 0) break;