Merge tag 'drm-next-2020-06-08' of git://anongit.freedesktop.org/drm/drm

[mirror_ubuntu-jammy-kernel.git] / drivers / pinctrl / sunxi / pinctrl-sun8i-a23-r.c

diff --git a/drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c b/drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c
index 8a08c4afc6a8686dff0ed5c21b2bce0fe293b226..9e5b61449999adbd2a895b8e3d85cc90093950bd 100644 (file)
--- a/drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c
@@ -103,8 +103,11 @@ static int sun8i_a23_r_pinctrl_probe(struct platform_device *pdev)
 
        rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);
        if (IS_ERR(rstc)) {
-               dev_err(&pdev->dev, "Reset controller missing\n");
-               return PTR_ERR(rstc);
+               ret = PTR_ERR(rstc);
+               if (ret == -EPROBE_DEFER)
+                       return ret;
+               dev_err(&pdev->dev, "Reset controller missing err=%d\n", ret);
+               return ret;
        }
 
        ret = reset_control_deassert(rstc);