From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 28 Dec 2010 05:44:03 +0000 (+0800)
Subject: rk29: vpu_mem: better init
X-Git-Tag: firefly_0821_release~10879
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=dcd4370a043045d85c54936561602dae0d6ad13c;p=firefly-linux-kernel-4.4.55.git

rk29: vpu_mem: better init
---

diff --git a/arch/arm/mach-rk29/vpu_mem.c b/arch/arm/mach-rk29/vpu_mem.c
index e9114e0c8cc2..faa83239412c 100644
--- a/arch/arm/mach-rk29/vpu_mem.c
+++ b/arch/arm/mach-rk29/vpu_mem.c
@@ -909,18 +909,14 @@ int vpu_mem_setup(struct vpu_mem_platform_data *pdata)
 		printk(KERN_ALERT "Unable to register vpu_mem driver!\n");
 		goto err_cant_register_device;
 	}
-	printk(KERN_ALERT "%s: %d init\n", pdata->name, vpu_mem.dev.minor);
 	vpu_mem_count++;
 
 	vpu_mem.num_entries = vpu_mem.size / VPU_MEM_MIN_ALLOC;
-	vpu_mem.bitmap = kmalloc(vpu_mem.num_entries *
+	vpu_mem.bitmap = kzalloc(vpu_mem.num_entries *
 				  sizeof(struct vpu_mem_bits), GFP_KERNEL);
 	if (!vpu_mem.bitmap)
 		goto err_no_mem_for_metadata;
 
-	memset(vpu_mem.bitmap, 0, sizeof(struct vpu_mem_bits) *
-					  vpu_mem.num_entries);
-
     region_set(0, vpu_mem.num_entries);
 
 	if (vpu_mem.cached)
@@ -941,6 +937,7 @@ int vpu_mem_setup(struct vpu_mem_platform_data *pdata)
 	debugfs_create_file(pdata->name, S_IFREG | S_IRUGO, NULL, (void *)vpu_mem.dev.minor,
 			    &debug_fops);
 #endif
+	printk("%s: %d initialized\n", pdata->name, vpu_mem.dev.minor);
 	return 0;
 error_cant_remap:
 	kfree(vpu_mem.bitmap);