From patchwork Wed Aug 24 11:38:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 9297601 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D4166608A7 for ; Wed, 24 Aug 2016 12:12:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C669E28F44 for ; Wed, 24 Aug 2016 12:12:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB60328F47; Wed, 24 Aug 2016 12:12:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 171CC28F45 for ; Wed, 24 Aug 2016 12:12:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754242AbcHXMMY (ORCPT ); Wed, 24 Aug 2016 08:12:24 -0400 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:55528 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754230AbcHXMMX (ORCPT ); Wed, 24 Aug 2016 08:12:23 -0400 Received: from debutante.sirena.org.uk ([2a01:348:6:8808:fab::3] helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1bcWW1-0005WW-0w; Wed, 24 Aug 2016 11:38:43 +0000 Received: from broonie by debutante with local (Exim 4.87) (envelope-from ) id 1bcWVy-00015y-1i; Wed, 24 Aug 2016 12:38:38 +0100 From: Mark Brown To: Wei Yongjun Cc: Mark Brown , Mark Brown , linux-spi@vger.kernel.org In-Reply-To: <1471964628-31179-1-git-send-email-weiyj.lk@gmail.com> Message-Id: Date: Wed, 24 Aug 2016 12:38:38 +0100 X-SA-Exim-Connect-IP: 2a01:348:6:8808:fab::3 X-SA-Exim-Mail-From: broonie@sirena.org.uk Subject: Applied "spi: spi-cavium-thunderx: Add missing clk_disable_unprepare()" to the spi tree X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch spi: spi-cavium-thunderx: Add missing clk_disable_unprepare() has been applied to the spi tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 568852b7002414c81084f07c7e39e897229d3b6f Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Tue, 23 Aug 2016 15:03:48 +0000 Subject: [PATCH] spi: spi-cavium-thunderx: Add missing clk_disable_unprepare() Add the missing clk_disable_unprepare() before return in the probe error handling case and remove. Signed-off-by: Wei Yongjun Signed-off-by: Mark Brown --- drivers/spi/spi-cavium-thunderx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/spi/spi-cavium-thunderx.c b/drivers/spi/spi-cavium-thunderx.c index eff2a130ef0c..877937706240 100644 --- a/drivers/spi/spi-cavium-thunderx.c +++ b/drivers/spi/spi-cavium-thunderx.c @@ -80,6 +80,7 @@ static int thunderx_spi_probe(struct pci_dev *pdev, return 0; error: + clk_disable_unprepare(p->clk); spi_master_put(master); return ret; } @@ -93,6 +94,7 @@ static void thunderx_spi_remove(struct pci_dev *pdev) if (!p) return; + clk_disable_unprepare(p->clk); /* Put everything in a known state. */ writeq(0, p->register_base + OCTEON_SPI_CFG(p)); }