misc: rp1-pio: Error out on incompatible firmware

If the RP1 firmware has reported an error then return that from the PIO probe function, otherwise defer the probing. Link: #6642 Signed-off-by: Phil Elwell <[email protected]>
raspberrypi · Feb 3, 2025 · cb7a24d · cb7a24d
1 parent 8a08b4a
commit cb7a24d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/drivers/misc/rp1-pio.c b/drivers/misc/rp1-pio.c
@@ -1277,8 +1277,10 @@ static int rp1_pio_probe(struct platform_device *pdev)
 		return dev_err_probe(dev, pdev->id, "alias is missing\n");
 
 	fw = devm_rp1_firmware_get(dev, dev->of_node);
-	if (IS_ERR_OR_NULL(fw))
-		return dev_err_probe(dev, -ENOENT, "failed to contact RP1 firmware\n");
+	if (!fw)
+		return dev_err_probe(dev, -EPROBE_DEFER, "failed to find RP1 firmware driver\n");
+	if (IS_ERR(fw))
+		return dev_err_probe(dev, PTR_ERR(fw), "failed to contact RP1 firmware\n");
 	ret = rp1_firmware_get_feature(fw, FOURCC_PIO, &op_base, &op_count);
 	if (ret < 0)
 		return ret;