net: bgmac: Fix return value check for fixed_phy_register()

[linux.git] / drivers / fpga / zynq-fpga.c

diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
index 426aa34c6a0dcdc96a2a13caa6ee13613e7e6bec..f8214cae9b6eca7bdd7a49d24ee89bca3d6c7ccd 100644 (file)
--- a/drivers/fpga/zynq-fpga.c
+++ b/drivers/fpga/zynq-fpga.c
@@ -493,15 +493,15 @@ static int zynq_fpga_ops_write_complete(struct fpga_manager *mgr,
        if (err)
                return err;
 
-       /* Release 'PR' control back to the ICAP */
-       zynq_fpga_write(priv, CTRL_OFFSET,
-               zynq_fpga_read(priv, CTRL_OFFSET) & ~CTRL_PCAP_PR_MASK);
-
        err = zynq_fpga_poll_timeout(priv, INT_STS_OFFSET, intr_status,
                                     intr_status & IXR_PCFG_DONE_MASK,
                                     INIT_POLL_DELAY,
                                     INIT_POLL_TIMEOUT);
 
+       /* Release 'PR' control back to the ICAP */
+       zynq_fpga_write(priv, CTRL_OFFSET,
+                       zynq_fpga_read(priv, CTRL_OFFSET) & ~CTRL_PCAP_PR_MASK);
+
        clk_disable(priv->clk);
 
        if (err)
@@ -582,11 +582,9 @@ static int zynq_fpga_probe(struct platform_device *pdev)
                return priv->irq;
 
        priv->clk = devm_clk_get(dev, "ref_clk");
-       if (IS_ERR(priv->clk)) {
-               if (PTR_ERR(priv->clk) != -EPROBE_DEFER)
-                       dev_err(dev, "input clock not found\n");
-               return PTR_ERR(priv->clk);
-       }
+       if (IS_ERR(priv->clk))
+               return dev_err_probe(dev, PTR_ERR(priv->clk),
+                                    "input clock not found\n");
 
        err = clk_prepare_enable(priv->clk);
        if (err) {