reset: reset-zynqmp: Defer probe if firmware is not ready

This patch is the part of mainline patch:
"drivers: Defer probe if firmware is not ready"
https://lkml.org/lkml/2019/3/4/1027

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/reset/reset-zynqmp.c b/drivers/reset/reset-zynqmp.c
index 2ef1f13aa47bc3e109b727143dd6c1ae246b8e0b..99e75d92dadab93d9cc57530a8032825c53d04bf 100644 (file)
--- a/drivers/reset/reset-zynqmp.c
+++ b/drivers/reset/reset-zynqmp.c
@@ -79,11 +79,11 @@ static int zynqmp_reset_probe(struct platform_device *pdev)
        if (!priv)
                return -ENOMEM;
 
-       platform_set_drvdata(pdev, priv);
-
        priv->eemi_ops = zynqmp_pm_get_eemi_ops();
-       if (!priv->eemi_ops)
-               return -ENXIO;
+       if (IS_ERR(priv->eemi_ops))
+               return PTR_ERR(priv->eemi_ops);
+
+       platform_set_drvdata(pdev, priv);
 
        priv->rcdev.ops = &zynqmp_reset_ops;
        priv->rcdev.owner = THIS_MODULE;