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/backend.c | |
parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
parent | 0a1cc0b6a4abaed5f891d1be3e3d0d7b9b719287 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
Diffstat (limited to 'drivers/char/agp/backend.c')
-rw-r--r-- | drivers/char/agp/backend.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c index 82b43c541c8..73f333f491b 100644 --- a/drivers/char/agp/backend.c +++ b/drivers/char/agp/backend.c @@ -222,12 +222,12 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge) struct agp_bridge_data *agp_alloc_bridge(void) { - struct agp_bridge_data *bridge = kmalloc(sizeof(*bridge), GFP_KERNEL); - + struct agp_bridge_data *bridge; + + bridge = kzalloc(sizeof(*bridge), GFP_KERNEL); if (!bridge) return NULL; - memset(bridge, 0, sizeof(*bridge)); atomic_set(&bridge->agp_in_use, 0); atomic_set(&bridge->current_memory_agp, 0); |