Skip to content

Commit

Permalink
char: Convert vmalloc/memset to vzalloc
Browse files Browse the repository at this point in the history
Signed-off-by: Joe Perches <[email protected]>
Signed-off-by: Jiri Kosina <[email protected]>
  • Loading branch information
JoePerches authored and Jiri Kosina committed Sep 15, 2011
1 parent 57f3224 commit 8e03bd6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions drivers/char/agp/backend.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
}
got_gatt = 1;

bridge->key_list = vmalloc(PAGE_SIZE * 4);
bridge->key_list = vzalloc(PAGE_SIZE * 4);
if (bridge->key_list == NULL) {
dev_err(&bridge->dev->dev,
"can't allocate memory for key lists\n");
Expand All @@ -181,7 +181,6 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
got_keylist = 1;

/* FIXME vmalloc'd memory not guaranteed contiguous */
memset(bridge->key_list, 0, PAGE_SIZE * 4);

if (bridge->driver->configure()) {
dev_err(&bridge->dev->dev, "error configuring host chipset\n");
Expand Down
3 changes: 1 addition & 2 deletions drivers/char/raw.c
Original file line number Diff line number Diff line change
Expand Up @@ -324,13 +324,12 @@ static int __init raw_init(void)
max_raw_minors = MAX_RAW_MINORS;
}

raw_devices = vmalloc(sizeof(struct raw_device_data) * max_raw_minors);
raw_devices = vzalloc(sizeof(struct raw_device_data) * max_raw_minors);
if (!raw_devices) {
printk(KERN_ERR "Not enough memory for raw device structures\n");
ret = -ENOMEM;
goto error;
}
memset(raw_devices, 0, sizeof(struct raw_device_data) * max_raw_minors);

ret = register_chrdev_region(dev, max_raw_minors, "raw");
if (ret)
Expand Down

0 comments on commit 8e03bd6

Please sign in to comment.