Skip to content

cix: Fix ref_clk/ddr_data error checks #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
USAVault wants to merge 3 commits into
base: main
Choose a base branch
from
Open

cix: Fix ref_clk/ddr_data error checks #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b02b32e
Fix validation check: apb_clk => ref_clk
Jul 15, 2026
d175a41
Fix validation check: vaddr => ddr_data
Jul 16, 2026
8d4ed54
Also kzalloc returns NULL on failure, not an ERR_PTR. Removed redunda…
Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions patches-6.18/0024-phy-add-cix-phy-driver.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion patches-6.18/0066-add-cix_dst-driver.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12616,7 +12616,7 @@ index 000000000000..111111111111
+ }
+
+ ddr_data = kzalloc(sizeof(*ddr_data), GFP_KERNEL);
+ if (IS_ERR_OR_NULL(vaddr)) {
+ if (!ddr_data) {
+ err = -ENOMEM;
+ goto unmap;
+ }
Expand Down
7 changes: 3 additions & 4 deletions patches-7.0/0024-phy-add-cix-phy-driver.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion patches-7.0/0066-add-cix_dst-driver.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12616,7 +12616,7 @@ index 000000000000..111111111111
+ }
+
+ ddr_data = kzalloc(sizeof(*ddr_data), GFP_KERNEL);
+ if (IS_ERR_OR_NULL(vaddr)) {
+ if (!ddr_data) {
+ err = -ENOMEM;
+ goto unmap;
+ }
Expand Down
6 changes: 3 additions & 3 deletions patches-7.1/0024-phy-add-cix-phy-driver.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion patches-7.1/0066-add-cix_dst-driver.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12616,7 +12616,7 @@ index 000000000000..111111111111
+ }
+
+ ddr_data = kzalloc(sizeof(*ddr_data), GFP_KERNEL);
+ if (IS_ERR_OR_NULL(vaddr)) {
+ if (!ddr_data) {
+ err = -ENOMEM;
+ goto unmap;
+ }
Expand Down