Skip to content

misc: rp1-pio: Defer for out-of-order probing #7215

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

Merged
pelwell merged 1 commit into from
Jan 28, 2026
+15 −7
Merged

misc: rp1-pio: Defer for out-of-order probing #7215

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 15 additions & 7 deletions drivers/misc/rp1-pio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,7 +1035,9 @@ struct rp1_pio_client *rp1_pio_open(void)
struct rp1_pio_client *client;

if (!g_pio)
return ERR_PTR(-ENOENT);
return ERR_PTR(-EPROBE_DEFER);
if (IS_ERR(g_pio))
return ERR_CAST(g_pio);

client = kzalloc(sizeof(*client), GFP_KERNEL);
if (!client)
Expand Down Expand Up @@ -1292,15 +1294,18 @@ static int rp1_pio_probe(struct platform_device *pdev)
return dev_err_probe(dev, -EPROBE_DEFER, "failed to find RP1 firmware driver\n");
if (IS_ERR(fw)) {
dev_warn(dev, "failed to contact RP1 firmware\n");
return PTR_ERR(fw);
ret = PTR_ERR(fw);
goto out_err;
}
ret = rp1_firmware_get_feature(fw, FOURCC_PIO, &op_base, &op_count);
if (ret < 0)
return ret;
goto out_err;

pio = devm_kzalloc(&pdev->dev, sizeof(*pio), GFP_KERNEL);
if (!pio)
return -ENOMEM;
if (!pio) {
ret = -ENOMEM;
goto out_err;
}

platform_set_drvdata(pdev, pio);
pio->fw_pio_base = op_base;
Expand All @@ -1311,8 +1316,10 @@ static int rp1_pio_probe(struct platform_device *pdev)
mutex_init(&pio->instr_mutex);

p = devm_platform_get_and_ioremap_resource(pdev, 0, &ioresource);
if (IS_ERR(p))
return PTR_ERR(p);
if (IS_ERR(p)) {
ret = PTR_ERR(p);
goto out_err;
}

pio->phys_addr = ioresource->start;

Expand Down Expand Up @@ -1359,6 +1366,7 @@ static int rp1_pio_probe(struct platform_device *pdev)
unregister_chrdev_region(pio->dev_num, 1);

out_err:
g_pio = ERR_PTR(ret);
return ret;
}

Expand Down