diff options
Diffstat (limited to 'drivers/char/agp/generic.c')
-rw-r--r-- | drivers/char/agp/generic.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c index ac9da0ca36b7..c4a38715c6f9 100644 --- a/drivers/char/agp/generic.c +++ b/drivers/char/agp/generic.c | |||
@@ -105,12 +105,10 @@ struct agp_memory *agp_create_memory(int scratch_pages) | |||
105 | { | 105 | { |
106 | struct agp_memory *new; | 106 | struct agp_memory *new; |
107 | 107 | ||
108 | new = kmalloc(sizeof(struct agp_memory), GFP_KERNEL); | 108 | new = kzalloc(sizeof(struct agp_memory), GFP_KERNEL); |
109 | |||
110 | if (new == NULL) | 109 | if (new == NULL) |
111 | return NULL; | 110 | return NULL; |
112 | 111 | ||
113 | memset(new, 0, sizeof(struct agp_memory)); | ||
114 | new->key = agp_get_key(); | 112 | new->key = agp_get_key(); |
115 | 113 | ||
116 | if (new->key < 0) { | 114 | if (new->key < 0) { |
@@ -414,7 +412,8 @@ static void agp_v2_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_ | |||
414 | u32 tmp; | 412 | u32 tmp; |
415 | 413 | ||
416 | if (*requested_mode & AGP2_RESERVED_MASK) { | 414 | if (*requested_mode & AGP2_RESERVED_MASK) { |
417 | printk(KERN_INFO PFX "reserved bits set in mode 0x%x. Fixed.\n", *requested_mode); | 415 | printk(KERN_INFO PFX "reserved bits set (%x) in mode 0x%x. Fixed.\n", |
416 | *requested_mode & AGP2_RESERVED_MASK, *requested_mode); | ||
418 | *requested_mode &= ~AGP2_RESERVED_MASK; | 417 | *requested_mode &= ~AGP2_RESERVED_MASK; |
419 | } | 418 | } |
420 | 419 | ||
@@ -492,7 +491,8 @@ static void agp_v3_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_ | |||
492 | u32 tmp; | 491 | u32 tmp; |
493 | 492 | ||
494 | if (*requested_mode & AGP3_RESERVED_MASK) { | 493 | if (*requested_mode & AGP3_RESERVED_MASK) { |
495 | printk(KERN_INFO PFX "reserved bits set in mode 0x%x. Fixed.\n", *requested_mode); | 494 | printk(KERN_INFO PFX "reserved bits set (%x) in mode 0x%x. Fixed.\n", |
495 | *requested_mode & AGP3_RESERVED_MASK, *requested_mode); | ||
496 | *requested_mode &= ~AGP3_RESERVED_MASK; | 496 | *requested_mode &= ~AGP3_RESERVED_MASK; |
497 | } | 497 | } |
498 | 498 | ||