Merge tag 'linux-kselftest-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / drivers / fpga / socfpga-a10.c

diff --git a/drivers/fpga/socfpga-a10.c b/drivers/fpga/socfpga-a10.c
index f8770af0f6b51975be92060292f8d5e1d7591d8d..a46e343a5b723cd828c54d52815c3ece8afa6ad7 100644 (file)
--- a/drivers/fpga/socfpga-a10.c
+++ b/drivers/fpga/socfpga-a10.c
@@ -519,8 +519,14 @@ static int socfpga_a10_fpga_probe(struct platform_device *pdev)
                return -EBUSY;
        }
 
-       return fpga_mgr_register(dev, "SoCFPGA Arria10 FPGA Manager",
+       ret = fpga_mgr_register(dev, "SoCFPGA Arria10 FPGA Manager",
                                 &socfpga_a10_fpga_mgr_ops, priv);
+       if (ret) {
+               clk_disable_unprepare(priv->clk);
+               return ret;
+       }
+
+       return 0;
 }
 
 static int socfpga_a10_fpga_remove(struct platform_device *pdev)