diff options
author | Burman Yan <yan_952@hotmail.com> | 2006-11-15 14:10:29 -0500 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-11-28 18:47:21 -0500 |
commit | 95b93a0cd46682c6d9e8eea803fda510cb6b863a (patch) | |
tree | 7e430d3fc04ed20791187d144730dd3052292c67 /drivers/mtd/mtdchar.c | |
parent | 998a43e72d20afa7566dad66fd866fe939a89c09 (diff) |
[MTD] replace kmalloc+memset with kzalloc
Signed-off-by: Yan Burman <yan_952@hotmail.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/mtd/mtdchar.c')
-rw-r--r-- | drivers/mtd/mtdchar.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c index 07618f51d969..7c4adc641328 100644 --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c | |||
@@ -431,7 +431,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file, | |||
431 | if(!(file->f_mode & 2)) | 431 | if(!(file->f_mode & 2)) |
432 | return -EPERM; | 432 | return -EPERM; |
433 | 433 | ||
434 | erase=kmalloc(sizeof(struct erase_info),GFP_KERNEL); | 434 | erase=kzalloc(sizeof(struct erase_info),GFP_KERNEL); |
435 | if (!erase) | 435 | if (!erase) |
436 | ret = -ENOMEM; | 436 | ret = -ENOMEM; |
437 | else { | 437 | else { |
@@ -440,7 +440,6 @@ static int mtd_ioctl(struct inode *inode, struct file *file, | |||
440 | 440 | ||
441 | init_waitqueue_head(&waitq); | 441 | init_waitqueue_head(&waitq); |
442 | 442 | ||
443 | memset (erase,0,sizeof(struct erase_info)); | ||
444 | if (copy_from_user(&erase->addr, argp, | 443 | if (copy_from_user(&erase->addr, argp, |
445 | sizeof(struct erase_info_user))) { | 444 | sizeof(struct erase_info_user))) { |
446 | kfree(erase); | 445 | kfree(erase); |