luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MTD] pmcmsp-flash.c: kmalloc + memset conversion to k[cz]alloc

Browse Source 
Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
Mariusz Kozlowski 2007-07-31 23:49:06 +02:00 committed by David Woodhouse
parent 40562f812b
commit 4fb4caa639
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/mtd/maps/pmcmsp-flash.c
View File

@ -73,13 +73,16 @@ int __init init_msp_flash(void)
return -ENXIO; return -ENXIO;
printk(KERN_NOTICE "Found %d PMC flash devices\n", fcnt); printk(KERN_NOTICE "Found %d PMC flash devices\n", fcnt);
msp_flash = (struct mtd_info **)kmalloc(
fcnt * sizeof(struct map_info *), GFP_KERNEL); msp_flash = kmalloc(fcnt * sizeof(struct map_info *), GFP_KERNEL);
msp_parts = (struct mtd_partition **)kmalloc( msp_parts = kmalloc(fcnt * sizeof(struct mtd_partition *), GFP_KERNEL);
fcnt * sizeof(struct mtd_partition *), GFP_KERNEL); msp_maps = kcalloc(fcnt, sizeof(struct mtd_info), GFP_KERNEL);
msp_maps = (struct map_info *)kmalloc( if (!msp_flash || !msp_parts || !msp_maps) {
fcnt * sizeof(struct mtd_info), GFP_KERNEL); kfree(msp_maps);
memset(msp_maps, 0, fcnt * sizeof(struct mtd_info)); kfree(msp_parts);
kfree(msp_flash);
return -ENOMEM;
}
/* loop over the flash devices, initializing each */ /* loop over the flash devices, initializing each */
for (i = 0; i < fcnt; i++) { for (i = 0; i < fcnt; i++) {
@ -95,9 +98,8 @@ int __init init_msp_flash(void)
continue; continue;
} }
msp_parts[i] = (struct mtd_partition *)kmalloc( msp_parts[i] = kcalloc(pcnt, sizeof(struct mtd_partition),
pcnt * sizeof(struct mtd_partition), GFP_KERNEL); GFP_KERNEL);
memset(msp_parts[i], 0, pcnt * sizeof(struct mtd_partition));
/* now initialize the devices proper */ /* now initialize the devices proper */
flash_name[5] = '0' + i; flash_name[5] = '0' + i;