diff --git a/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c b/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c
index 85cc359ec996..cd937016298c 100644
--- a/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c
+++ b/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c
@@ -376,7 +376,7 @@ static int cam_cci_component_bind(struct device *dev,
 	int rc = 0;
 	struct platform_device *pdev = to_platform_device(dev);
 
-	new_cci_dev = kzalloc(sizeof(struct cci_device),
+	new_cci_dev = devm_kzalloc(&pdev->dev, sizeof(struct cci_device),
 		GFP_KERNEL);
 	if (!new_cci_dev)
 		return -ENOMEM;
@@ -445,7 +445,7 @@ static int cam_cci_component_bind(struct device *dev,
 	CAM_DBG(CAM_CCI, "Component bound successfully");
 	return rc;
 cci_no_resource:
-	kfree(new_cci_dev);
+	devm_kfree(&pdev->dev, new_cci_dev);
 	return rc;
 }