diff --git a/drivers/acpi/arm64/mpam.c b/drivers/acpi/arm64/mpam.c
index de866e711be2ee3b1ecf0945508f0aa0f5b7a81b..d34e47fa45588da4f75ddb0c22052b1e9e8a55e8 100644
--- a/drivers/acpi/arm64/mpam.c
+++ b/drivers/acpi/arm64/mpam.c
@@ -306,8 +306,8 @@ static int __init _parse_table(struct acpi_table_header *table)
 		memset(props, 0, sizeof(props));
 
 		pdev = platform_device_alloc("mpam_msc", tbl_msc->identifier);
-		if (IS_ERR(pdev)) {
-			err = PTR_ERR(pdev);
+		if (!pdev) {
+			err = -ENOMEM;
 			break;
 		}
 
diff --git a/drivers/infiniband/hw/hiroce3/dfx/roce_dfx_cap.c b/drivers/infiniband/hw/hiroce3/dfx/roce_dfx_cap.c
index cdc75962f03febab50dd11cd05411f9f13460d4b..3a494263f356a37c6884b0810fb5f759da3b2361 100644
--- a/drivers/infiniband/hw/hiroce3/dfx/roce_dfx_cap.c
+++ b/drivers/infiniband/hw/hiroce3/dfx/roce_dfx_cap.c
@@ -157,7 +157,7 @@ static int roce3_create_thread(struct sdk_thread_info *thread_info)
 {
 	thread_info->thread_obj = kthread_run(roce3_linux_thread_func,
 		thread_info, thread_info->name);
-	if (!thread_info->thread_obj) {
+	if (IS_ERR(thread_info->thread_obj)) {
 		pr_err("[ROCE, ERR] %s: Failed to create thread\n", __func__);
 		return (-EFAULT);
 	}