diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-01-24 07:14:25 (GMT) |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-01-24 07:14:25 (GMT) |
commit | e47b207a5bcb73bb097f94d9fe364f50737b0eb2 (patch) | |
tree | 57389653c37d001de3a90655cb4172ba29199ce4 /drivers/mtd/chips/sharp.c | |
parent | d344bff9c36db17dc4765215495aaa7212c1eb6c (diff) | |
parent | 419dd8378dfa32985672ab7927b4bc827f33b332 (diff) | |
download | linux-e47b207a5bcb73bb097f94d9fe364f50737b0eb2.tar.xz |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/mtd/chips/sharp.c')
-rw-r--r-- | drivers/mtd/chips/sharp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mtd/chips/sharp.c b/drivers/mtd/chips/sharp.c index 967abbe..c9cd3d2 100644 --- a/drivers/mtd/chips/sharp.c +++ b/drivers/mtd/chips/sharp.c @@ -112,18 +112,16 @@ static struct mtd_info *sharp_probe(struct map_info *map) struct sharp_info *sharp = NULL; int width; - mtd = kmalloc(sizeof(*mtd), GFP_KERNEL); + mtd = kzalloc(sizeof(*mtd), GFP_KERNEL); if(!mtd) return NULL; - sharp = kmalloc(sizeof(*sharp), GFP_KERNEL); + sharp = kzalloc(sizeof(*sharp), GFP_KERNEL); if(!sharp) { kfree(mtd); return NULL; } - memset(mtd, 0, sizeof(*mtd)); - width = sharp_probe_map(map,mtd); if(!width){ kfree(mtd); @@ -143,7 +141,6 @@ static struct mtd_info *sharp_probe(struct map_info *map) mtd->writesize = 1; mtd->name = map->name; - memset(sharp, 0, sizeof(*sharp)); sharp->chipshift = 23; sharp->numchips = 1; sharp->chips[0].start = 0; |