From patchwork Thu Feb 16 14:52:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Micha=C5=82_Zegan?= X-Patchwork-Id: 9577353 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 34F0C600C5 for ; Thu, 16 Feb 2017 14:53:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A6812040D for ; Thu, 16 Feb 2017 14:53:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0F03028600; Thu, 16 Feb 2017 14:53:12 +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 B5F772040D for ; Thu, 16 Feb 2017 14:53:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932343AbdBPOxA (ORCPT ); Thu, 16 Feb 2017 09:53:00 -0500 Received: from webczatnet.pl ([91.121.100.5]:59918 "EHLO webczatnet.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932290AbdBPOw6 (ORCPT ); Thu, 16 Feb 2017 09:52:58 -0500 Received: from [193.200.46.1] (port=45756 helo=localhost.localdomain) by webczatnet.pl with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ceNQQ-0000uN-Os; Thu, 16 Feb 2017 15:52:50 +0100 From: =?UTF-8?q?Micha=C5=82=20Zegan?= To: Kevin Hilman Cc: Carlo Caione , Ulf Hansson , linux-mmc@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Micha=C5=82=20Zegan?= Subject: [PATCH 1/2] mmc: meson-gx: prevent cfg_div_clk from being disabled on init Date: Thu, 16 Feb 2017 15:52:21 +0100 Message-Id: <20170216145222.1577-2-webczat@webczatnet.pl> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170216145222.1577-1-webczat@webczatnet.pl> References: <20170216145222.1577-1-webczat@webczatnet.pl> MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP At the end of function meson_mmc_clk_init, the cfg_div clock was prepared, enabled and configured, but then immediately disabled due to bogus if statements. That made later calls to clk_disable_unprepare executed during module removal to fail with a kernel warning. Fix that by changing the code to disable clock only when it failed to be configured. Signed-off-by: Michał Zegan --- drivers/mmc/host/meson-gx-mmc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 09739352834c..d444b6bfa02b 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -324,11 +324,12 @@ static int meson_mmc_clk_init(struct meson_host *host) writel(cfg, host->regs + SD_EMMC_CFG); ret = clk_prepare_enable(host->cfg_div_clk); - if (!ret) + if (!ret) { ret = meson_mmc_clk_set(host, f_min); - if (!ret) - clk_disable_unprepare(host->cfg_div_clk); + if (ret) + clk_disable_unprepare(host->cfg_div_clk); + } return ret; }