summaryrefslogtreecommitdiffstats
path: root/drivers/fpga
diff options
context:
space:
mode:
authorMoritz Fischer <moritz.fischer@ettus.com>2015-10-19 13:35:33 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-23 16:49:12 -0700
commit6376931babd833dbd6f51e22a3de449ce6c60d61 (patch)
tree6d77e97b618dfccd144e84227fa84803ebd491b2 /drivers/fpga
parent525d12f27bb05c4255857849a8d28c0c086bd28e (diff)
downloadop-kernel-dev-6376931babd833dbd6f51e22a3de449ce6c60d61.zip
op-kernel-dev-6376931babd833dbd6f51e22a3de449ce6c60d61.tar.gz
fpga: zynq-fpga: Fix unbalanced clock handling
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>
Diffstat (limited to 'drivers/fpga')
-rw-r--r--drivers/fpga/zynq-fpga.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
index 103303c..617d382 100644
--- a/drivers/fpga/zynq-fpga.c
+++ b/drivers/fpga/zynq-fpga.c
@@ -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;
}
OpenPOWER on IntegriCloud