From b02b32e21164cea3cf0639563432980d47e4a37d Mon Sep 17 00:00:00 2001 From: USAVault Date: Wed, 15 Jul 2026 09:55:32 +0300 Subject: [PATCH 1/3] Fix validation check: apb_clk => ref_clk --- patches-6.18/0024-phy-add-cix-phy-driver.patch | 6 +++--- patches-7.0/0024-phy-add-cix-phy-driver.patch | 7 +++---- patches-7.1/0024-phy-add-cix-phy-driver.patch | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/patches-6.18/0024-phy-add-cix-phy-driver.patch b/patches-6.18/0024-phy-add-cix-phy-driver.patch index 0b943fb..19d0065 100644 --- a/patches-6.18/0024-phy-add-cix-phy-driver.patch +++ b/patches-6.18/0024-phy-add-cix-phy-driver.patch @@ -1183,9 +1183,9 @@ index 000000000000..111111111111 + } + + u3phy->ref_clk = devm_clk_get(dev, "ref_clk"); -+ if (IS_ERR(u3phy->apb_clk)) { -+ dev_err(dev, "phy apb clock not found\n"); -+ return PTR_ERR(u3phy->apb_clk); ++ if (IS_ERR(u3phy->ref_clk)) { ++ dev_err(dev, "phy ref clock not found\n"); ++ return PTR_ERR(u3phy->ref_clk); + } + + u3phy->base = devm_platform_ioremap_resource(pdev, 0); diff --git a/patches-7.0/0024-phy-add-cix-phy-driver.patch b/patches-7.0/0024-phy-add-cix-phy-driver.patch index c512fd3..4a975f9 100644 --- a/patches-7.0/0024-phy-add-cix-phy-driver.patch +++ b/patches-7.0/0024-phy-add-cix-phy-driver.patch @@ -1183,10 +1183,9 @@ index 000000000000..111111111111 + } + + u3phy->ref_clk = devm_clk_get(dev, "ref_clk"); -+ if (IS_ERR(u3phy->apb_clk)) { -+ dev_err(dev, "phy apb clock not found\n"); -+ return PTR_ERR(u3phy->apb_clk); -+ } ++ if (IS_ERR(u3phy->ref_clk)) { ++ dev_err(dev, "phy ref clock not found\n"); ++ return PTR_ERR(u3phy->ref_clk); + + u3phy->base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(u3phy->base)) diff --git a/patches-7.1/0024-phy-add-cix-phy-driver.patch b/patches-7.1/0024-phy-add-cix-phy-driver.patch index a74bcbf..e731dcf 100644 --- a/patches-7.1/0024-phy-add-cix-phy-driver.patch +++ b/patches-7.1/0024-phy-add-cix-phy-driver.patch @@ -1183,9 +1183,9 @@ index 000000000000..111111111111 + } + + u3phy->ref_clk = devm_clk_get(dev, "ref_clk"); -+ if (IS_ERR(u3phy->apb_clk)) { -+ dev_err(dev, "phy apb clock not found\n"); -+ return PTR_ERR(u3phy->apb_clk); ++ if (IS_ERR(u3phy->ref_clk)) { ++ dev_err(dev, "phy ref clock not found\n"); ++ return PTR_ERR(u3phy->ref_clk); + } + + u3phy->base = devm_platform_ioremap_resource(pdev, 0); From d175a415193a4fa648056c4445538e340cbf73ab Mon Sep 17 00:00:00 2001 From: USAVault Date: Thu, 16 Jul 2026 09:36:27 +0300 Subject: [PATCH 2/3] Fix validation check: vaddr => ddr_data --- patches-6.18/0066-add-cix_dst-driver.patch | 2 +- patches-7.0/0066-add-cix_dst-driver.patch | 2 +- patches-7.1/0066-add-cix_dst-driver.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches-6.18/0066-add-cix_dst-driver.patch b/patches-6.18/0066-add-cix_dst-driver.patch index d608b5f..a14583b 100644 --- a/patches-6.18/0066-add-cix_dst-driver.patch +++ b/patches-6.18/0066-add-cix_dst-driver.patch @@ -12616,7 +12616,7 @@ index 000000000000..111111111111 + } + + ddr_data = kzalloc(sizeof(*ddr_data), GFP_KERNEL); -+ if (IS_ERR_OR_NULL(vaddr)) { ++ if (IS_ERR_OR_NULL(ddr_data)) { + err = -ENOMEM; + goto unmap; + } diff --git a/patches-7.0/0066-add-cix_dst-driver.patch b/patches-7.0/0066-add-cix_dst-driver.patch index cef422d..3254e15 100644 --- a/patches-7.0/0066-add-cix_dst-driver.patch +++ b/patches-7.0/0066-add-cix_dst-driver.patch @@ -12616,7 +12616,7 @@ index 000000000000..111111111111 + } + + ddr_data = kzalloc(sizeof(*ddr_data), GFP_KERNEL); -+ if (IS_ERR_OR_NULL(vaddr)) { ++ if (IS_ERR_OR_NULL(ddr_data)) { + err = -ENOMEM; + goto unmap; + } diff --git a/patches-7.1/0066-add-cix_dst-driver.patch b/patches-7.1/0066-add-cix_dst-driver.patch index cef422d..3254e15 100644 --- a/patches-7.1/0066-add-cix_dst-driver.patch +++ b/patches-7.1/0066-add-cix_dst-driver.patch @@ -12616,7 +12616,7 @@ index 000000000000..111111111111 + } + + ddr_data = kzalloc(sizeof(*ddr_data), GFP_KERNEL); -+ if (IS_ERR_OR_NULL(vaddr)) { ++ if (IS_ERR_OR_NULL(ddr_data)) { + err = -ENOMEM; + goto unmap; + } From 8d4ed5491d581eee07ea22732915b486baeb924c Mon Sep 17 00:00:00 2001 From: USAVault Date: Thu, 16 Jul 2026 09:51:01 +0300 Subject: [PATCH 3/3] Also kzalloc returns NULL on failure, not an ERR_PTR. Removed redundant IS_ERR_OR_NULL --- patches-6.18/0066-add-cix_dst-driver.patch | 2 +- patches-7.0/0066-add-cix_dst-driver.patch | 2 +- patches-7.1/0066-add-cix_dst-driver.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches-6.18/0066-add-cix_dst-driver.patch b/patches-6.18/0066-add-cix_dst-driver.patch index a14583b..d4e3123 100644 --- a/patches-6.18/0066-add-cix_dst-driver.patch +++ b/patches-6.18/0066-add-cix_dst-driver.patch @@ -12616,7 +12616,7 @@ index 000000000000..111111111111 + } + + ddr_data = kzalloc(sizeof(*ddr_data), GFP_KERNEL); -+ if (IS_ERR_OR_NULL(ddr_data)) { ++ if (!ddr_data) { + err = -ENOMEM; + goto unmap; + } diff --git a/patches-7.0/0066-add-cix_dst-driver.patch b/patches-7.0/0066-add-cix_dst-driver.patch index 3254e15..b5011a3 100644 --- a/patches-7.0/0066-add-cix_dst-driver.patch +++ b/patches-7.0/0066-add-cix_dst-driver.patch @@ -12616,7 +12616,7 @@ index 000000000000..111111111111 + } + + ddr_data = kzalloc(sizeof(*ddr_data), GFP_KERNEL); -+ if (IS_ERR_OR_NULL(ddr_data)) { ++ if (!ddr_data) { + err = -ENOMEM; + goto unmap; + } diff --git a/patches-7.1/0066-add-cix_dst-driver.patch b/patches-7.1/0066-add-cix_dst-driver.patch index 3254e15..b5011a3 100644 --- a/patches-7.1/0066-add-cix_dst-driver.patch +++ b/patches-7.1/0066-add-cix_dst-driver.patch @@ -12616,7 +12616,7 @@ index 000000000000..111111111111 + } + + ddr_data = kzalloc(sizeof(*ddr_data), GFP_KERNEL); -+ if (IS_ERR_OR_NULL(ddr_data)) { ++ if (!ddr_data) { + err = -ENOMEM; + goto unmap; + }