diff --git a/msm/eva/cvp.c b/msm/eva/cvp.c
index ea1a965ada..a47f53eca8 100644
--- a/msm/eva/cvp.c
+++ b/msm/eva/cvp.c
@@ -419,6 +419,10 @@ static int msm_probe_cvp_device(struct platform_device *pdev)
 	list_add_tail(&core->list, &cvp_driver->cores);
 	mutex_unlock(&cvp_driver->lock);
 
+	cvp_driver->debugfs_root = msm_cvp_debugfs_init_drv();
+	if (!cvp_driver->debugfs_root)
+		dprintk(CVP_ERR, "Failed to create debugfs for msm_cvp\n");
+
 	core->debugfs_root = msm_cvp_debugfs_init_core(
 		core, cvp_driver->debugfs_root);
 
@@ -601,10 +605,6 @@ static int __init msm_cvp_init(void)
 
 	INIT_LIST_HEAD(&cvp_driver->cores);
 	mutex_init(&cvp_driver->lock);
-	cvp_driver->debugfs_root = msm_cvp_debugfs_init_drv();
-	if (!cvp_driver->debugfs_root)
-		dprintk(CVP_ERR,
-			"Failed to create debugfs for msm_cvp\n");
 
 	rc = platform_driver_register(&msm_cvp_driver);
 	if (rc) {