diff --git a/drivers/platform/tegra/rtcpu/rtcpu-debug.c b/drivers/platform/tegra/rtcpu/rtcpu-debug.c
index a56baec2..e17c04d0 100644
--- a/drivers/platform/tegra/rtcpu/rtcpu-debug.c
+++ b/drivers/platform/tegra/rtcpu/rtcpu-debug.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
-// Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
 #include "soc/tegra/camrtc-dbg-messages.h"
 
@@ -1882,11 +1882,9 @@ static int camrtc_debug_probe(struct tegra_ivc_channel *ch)
 	}
 
 	crd->icc_path = devm_of_icc_get(crd->mem_devices[0], "write");
-	if (IS_ERR(crd->icc_path)) {
-		dev_err(dev, "failed to get icc path for rtcpu, err: %ld\n",
-				PTR_ERR(crd->icc_path));
-		crd->icc_path = NULL;
-	}
+	if (IS_ERR(crd->icc_path))
+		return dev_err_probe(dev, PTR_ERR(crd->icc_path),
+				     "failed to get icc write handle\n");
 
 	if (camrtc_debug_populate(ch))
 		return -ENOMEM;
diff --git a/drivers/video/tegra/host/vi/vi5.c b/drivers/video/tegra/host/vi/vi5.c
index 2669db05..5dcfdb37 100644
--- a/drivers/video/tegra/host/vi/vi5.c
+++ b/drivers/video/tegra/host/vi/vi5.c
@@ -252,10 +252,9 @@ static int vi5_probe(struct platform_device *pdev)
 	vi5 = pdata->private_data;
 
 	vi5->icc_write = devm_of_icc_get(dev, "write");
-	if (IS_ERR(vi5->icc_write)) {
-		dev_err(dev, "failed to get icc write handle\n");
-		return PTR_ERR(vi5->icc_write);
-	}
+	if (IS_ERR(vi5->icc_write))
+		return dev_err_probe(&pdev->dev, PTR_ERR(vi5->icc_write),
+				     "failed to get icc write handle\n");
 
 	err = nvhost_client_device_get_resources(pdev);
 	if (err)