projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[powerpc.git]
/
drivers
/
char
/
agp
/
ati-agp.c
diff --git
a/drivers/char/agp/ati-agp.c
b/drivers/char/agp/ati-agp.c
index
0b6e726
..
fbd4155
100644
(file)
--- 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;
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;
if (tables == NULL)
return -ENOMEM;
- memset(tables, 0, sizeof(ati_page_map *) * (nr_tables + 1));
for (i = 0; i < nr_tables; i++) {
for (i = 0; i < nr_tables; i++) {
- entry = k
m
alloc(sizeof(ati_page_map), GFP_KERNEL);
+ entry = k
z
alloc(sizeof(ati_page_map), GFP_KERNEL);
if (entry == NULL) {
while (i>0) {
kfree (tables[i-1]);
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;
}
retval = -ENOMEM;
break;
}
- memset(entry, 0, sizeof(ati_page_map));
tables[i] = entry;
retval = ati_create_page_map(entry);
if (retval != 0) break;
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 = {
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,
.name = "agpgart-ati",
.id_table = agp_ati_pci_table,
.probe = agp_ati_probe,