From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754470AbbJSUWi (ORCPT ); Mon, 19 Oct 2015 16:22:38 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:33527 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753452AbbJSUWh (ORCPT ); Mon, 19 Oct 2015 16:22:37 -0400 From: Moritz Fischer To: atull@opensource.altera.com Cc: michal.simek@xilinx.com, soren.brinkmann@xilinx.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, gregkh@linuxfoundation.com, Moritz Fischer Subject: [PATCH] fpga: zynq-fpga: Fix unbalanced clock handling Date: Mon, 19 Oct 2015 13:22:55 -0700 Message-Id: <1445286175-1640-1-git-send-email-moritz.fischer@ettus.com> X-Mailer: git-send-email 2.6.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This commit fixes the unbalanced clock handling, where a failed probe would leave the clock with a prepare count of -1. Reported-by: Josh Cartwright Signed-off-by: Moritz Fischer --- drivers/fpga/zynq-fpga.c | 4 ++-- 1 file 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; } -- 2.6.1