From patchwork Sun Apr 3 05:49:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaoqian Lin X-Patchwork-Id: 12799493 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 17267C433F5 for ; Sun, 3 Apr 2022 05:50:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:Subject:Cc:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=lST9HDKU4gSlMrynPTsIJk+QW45606R+AyRsyoyZ7VU=; b=AU9YPowliuMhAs zwLB453Urpi4GOn5fKf9ARMGPz4oOkAX40P7Xq2O3Ox/Rm1KQA6ZJKDs6X6VG0qf7bcmjsS/kB0wz +hqWZuSNbOWwKWsbQyDvdU6G3jpjiQs41G6UJvM3QSlaHe/7lXAOFwURPdRbSZ8i8/9dkAs5yNfbv NluGNMzLNU9hhJXJvk/W8SlA5BufJXA7KQpqN70z3DUZqgcW+cMAEl1qXXZGR/A52ij1JmliLPfOJ By2gRQtwZ5prmnO0ROXH+cgsYPovprBV6SnMjOiPcMy2p95pMjAbiYf5Bmvh6DFO5bRoKl2DL0WoU 3yEE+GfmikW0ukdAwC6w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nat78-00Amy8-HQ; Sun, 03 Apr 2022 05:49:26 +0000 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nat75-00Amxc-AP for linux-arm-kernel@lists.infradead.org; Sun, 03 Apr 2022 05:49:24 +0000 Received: by mail-pg1-x532.google.com with SMTP id k14so5738268pga.0 for ; Sat, 02 Apr 2022 22:49:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=FmtIu4Pls8Ojb/aaUXocXJF0tN/1qMyxMF56b2SiIYk=; b=pMOT+eXyKvyQNEYJONFSNHX+R6GBmJgYwKQHiadpqbUtimS4b2PDi4qlQeOrRPqkyi 1/ugL643s604Puo7tRf9eKhTztPf87JyX3erM9aNgdTrpHlpuYqO4X/cuxY/yzeKHffu pd2RHwP3gERRylVBl+UyAYZL5WbRdUXSFtYQwoM7JXK+GAhWg1glzfk4pnfxk9vDjEef hDJmiSKsptpx6KuPJC4jGtxKUB876Yg8vm3h2Czgh3/sIYcyGOlZHjd6R0i2zVfkXOq6 TRjjY6SZcS01HG6Yukk4E+9ulQDAyiESQaRAwkFAlerAUDJh6HfBqptjdLRTvHb3C6ex paKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=FmtIu4Pls8Ojb/aaUXocXJF0tN/1qMyxMF56b2SiIYk=; b=ZLZ+wa5Am9NuEu1Y2hwINBqS0KYW4Tundnu+KCUtsmV/CkQqnVOQIWo+WKyLmGpuau ZkfhGMT/iBGTvxKKL38dqm+zREHWKlNfbU67VeHaoKr2nr+7hmcsLX8H6HUT+xQT1hTZ F/XNUZdpiu5cdgTTKAnfl1795DRqMOdZKFO+hhwEWPYlQEnl1qM59b3eiCQBZmqczFca xzV9kFCXAH9C/kxLSg2866Ip4yeA38ZD/6Hiua8ulKzbP4Zg8LlqyQDfRN6FXUjmicMn Mbc1CZBXQBXoowiTf8ZU0Xum6+jwYsveUOirmi6CRlbESfQreXAA5UgwGd/uVdTUIry+ mhxw== X-Gm-Message-State: AOAM532sFLdZfO9zl9/CDrVqbmtHem8U9EO+Bj7x64sFYDIt8lyJg69p 5Dt0poQyJUqIsXKc1EcnadU= X-Google-Smtp-Source: ABdhPJyNGXn4TOUxCtHsDteWG+OIl68bV+vIcGmkG52HDh/dOmBsojpcEzsUKqeCfj+2RuhQtDidcw== X-Received: by 2002:a65:434b:0:b0:382:4fa9:3be6 with SMTP id k11-20020a65434b000000b003824fa93be6mr21127660pgq.459.1648964962007; Sat, 02 Apr 2022 22:49:22 -0700 (PDT) Received: from localhost.localdomain ([159.226.95.43]) by smtp.googlemail.com with ESMTPSA id k11-20020a056a00168b00b004f7e1555538sm7742460pfc.190.2022.04.02.22.49.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 22:49:21 -0700 (PDT) From: Miaoqian Lin To: Hans Ulli Kroll , Linus Walleij , Alessandro Zummo , Alexandre Belloni , linux-arm-kernel@lists.infradead.org, linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linmq006@gmail.com Subject: [PATCH] rtc: ftrtc010: Fix error handling in ftrtc010_rtc_probe Date: Sun, 3 Apr 2022 05:49:12 +0000 Message-Id: <20220403054912.31739-1-linmq006@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220402_224923_416242_6DDDCAA9 X-CRM114-Status: GOOD ( 14.69 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In the error handling path, the clk_prepare_enable() function call should be balanced by a corresponding 'clk_disable_unprepare()' call , as already done in the remove function. clk_disable_unprepare calls clk_disable() and clk_unprepare(). They will use IS_ERR_OR_NULL to check the argument. Fixes: ac05fba39cc5 ("rtc: gemini: Add optional clock handling") Signed-off-by: Miaoqian Lin Reviewed-by: Linus Walleij --- drivers/rtc/rtc-ftrtc010.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/drivers/rtc/rtc-ftrtc010.c b/drivers/rtc/rtc-ftrtc010.c index 53bb08fe1cd4..25c6e7d9570f 100644 --- a/drivers/rtc/rtc-ftrtc010.c +++ b/drivers/rtc/rtc-ftrtc010.c @@ -137,26 +137,34 @@ static int ftrtc010_rtc_probe(struct platform_device *pdev) ret = clk_prepare_enable(rtc->extclk); if (ret) { dev_err(dev, "failed to enable EXTCLK\n"); - return ret; + goto err_disable_pclk; } } rtc->rtc_irq = platform_get_irq(pdev, 0); - if (rtc->rtc_irq < 0) - return rtc->rtc_irq; + if (rtc->rtc_irq < 0) { + ret = rtc->rtc_irq; + goto err_disable_extclk; + } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -ENODEV; + if (!res) { + ret = -ENODEV; + goto err_disable_extclk; + } rtc->rtc_base = devm_ioremap(dev, res->start, resource_size(res)); - if (!rtc->rtc_base) - return -ENOMEM; + if (!rtc->rtc_base) { + ret = -ENOMEM; + goto err_disable_extclk; + } rtc->rtc_dev = devm_rtc_allocate_device(dev); - if (IS_ERR(rtc->rtc_dev)) - return PTR_ERR(rtc->rtc_dev); + if (IS_ERR(rtc->rtc_dev)) { + ret = PTR_ERR(rtc->rtc_dev); + goto err_disable_extclk; + } rtc->rtc_dev->ops = &ftrtc010_rtc_ops; @@ -172,9 +180,15 @@ static int ftrtc010_rtc_probe(struct platform_device *pdev) ret = devm_request_irq(dev, rtc->rtc_irq, ftrtc010_rtc_interrupt, IRQF_SHARED, pdev->name, dev); if (unlikely(ret)) - return ret; + goto err_disable_extclk; return devm_rtc_register_device(rtc->rtc_dev); + +err_disable_extclk: + clk_disable_unprepare(rtc->extclk); +err_disable_pclk: + clk_disable_unprepare(rtc->pclk); + return ret; } static int ftrtc010_rtc_remove(struct platform_device *pdev)