fpga: zynq-fpga: Fix unbalanced clock handling
authorMoritz Fischer <moritz.fischer@ettus.com>
Mon, 19 Oct 2015 20:35:33 +0000 (13:35 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 Oct 2015 23:49:12 +0000 (16:49 -0700)
This commit fixes the unbalanced clock handling, where
a failed probe would leave the clock with an enable count of -1.

Reported-by: Josh Cartwright <joshc@ni.com>
Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/fpga/zynq-fpga.c

index 103303c..617d382 100644 (file)
@@ -487,7 +487,7 @@ static int zynq_fpga_probe(struct platform_device *pdev)
                                &zynq_fpga_ops, priv);
        if (err) {
                dev_err(dev, "unable to register FPGA manager");
-               clk_disable_unprepare(priv->clk);
+               clk_unprepare(priv->clk);
                return err;
        }
 
@@ -502,7 +502,7 @@ static int zynq_fpga_remove(struct platform_device *pdev)
 
        priv = platform_get_drvdata(pdev);
 
-       clk_disable_unprepare(priv->clk);
+       clk_unprepare(priv->clk);
 
        return 0;
 }