From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29AD1C47256 for ; Sun, 3 May 2020 18:22:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A700206B8 for ; Sun, 3 May 2020 18:22:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=umn.edu header.i=@umn.edu header.b="Qeo0JMru" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728755AbgECSWx (ORCPT ); Sun, 3 May 2020 14:22:53 -0400 Received: from mta-p6.oit.umn.edu ([134.84.196.206]:33454 "EHLO mta-p6.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728813AbgECSWu (ORCPT ); Sun, 3 May 2020 14:22:50 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id 49FZ952kkVz9vK02 for ; Sun, 3 May 2020 18:22:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p6.oit.umn.edu ([127.0.0.1]) by localhost (mta-p6.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U-tmgrhs2TiL for ; Sun, 3 May 2020 13:22:49 -0500 (CDT) Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p6.oit.umn.edu (Postfix) with ESMTPS id 49FZ951dQ3z9vJys for ; Sun, 3 May 2020 13:22:49 -0500 (CDT) Received: by mail-qk1-f197.google.com with SMTP id 30so16237259qkp.21 for ; Sun, 03 May 2020 11:22:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=44UH4OZK/PHghykhYyE3yItp0PnnhS36mAT7ZC5+7gg=; b=Qeo0JMruk9M86TsRUveVEUvjTHwFL8pMp4RmUzoYKYQ2Anr583oI1WR1RqZ7BYoAxm 2hXRMzXwvpX9uL39D2bCoHlLG9/Um5+eN1mqRw4kAfGxo8PoWRyCoeZNk+cRAH0RcKIi bo7v4sjlN8cL6Cj9/VkCcBnOB4GOGoYF0t/wPbIIidDA/SXd5YD68JsLY2GILMUJ+NOz 2GxaIWy9ISuK3fQjqtWjEBXdya7NtqykbX7NdXP++M1kwmEFCT56iJ8Y9Bo0l4vhQPWG 77uxQ1z6oDpgMuTJgMg2smnRUKED52KD05/6m+UYkT2rHNgiQrsQ05j152NRteQB6oz9 kJbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=44UH4OZK/PHghykhYyE3yItp0PnnhS36mAT7ZC5+7gg=; b=B9QENr+DVMROPIpM3VMMCgr65ZnAdt5vpzhV7NO58bSgDd+whV+uxyRn2vvLtKKL8T isU7/AIXF1eBq7XaJmbqBdbH17rAsvm3x3MqICCStJ+cVNUnmGoKjdHfDugeZYERhQ+U B55IGrbI1ThKkXrbV/eqGg06QaQCPFrhHe78WHMhhJltCgULeFCpjktKZdSVXmZizIB8 KLacE7+toYJCFWjMjkXfiGk07MhxxwLJM/fRcVFg8BBphjQQ2n1J2BWxsjYhJ0jpnaGS hEU+MSyqGprGgUmF2qNWp4U+E1n7zbLXcxTxCN2lzKOfim8c+6UsM9BNQFvijhzFj6IG bnEA== X-Gm-Message-State: AGi0PubSijgqXUmBQkqV2xqm//9RI08+KSeONZlonZc/QBarYkXqSKrO F3cEsMl+1R8Per3Ag2gllHcKSyrSWdZUrnNUTqCbHoZCgwTzhr1DJ7zcuzQUarWJT2JcsSYUJmV LcC+oSzmEPMuJdqS2Wcs/DH8x X-Received: by 2002:ac8:6751:: with SMTP id n17mr14156531qtp.16.1588530168304; Sun, 03 May 2020 11:22:48 -0700 (PDT) X-Google-Smtp-Source: APiQypJRLv5dHefXW50lpSlndW5FvoT6o8IaByWKvbRXvRFcNjtZRAACEV+oYHlKNP1xZa75T4OBoA== X-Received: by 2002:ac8:6751:: with SMTP id n17mr14156503qtp.16.1588530167813; Sun, 03 May 2020 11:22:47 -0700 (PDT) Received: from qiushi.dtc.umn.edu (cs-kh5248-02-umh.cs.umn.edu. [128.101.106.4]) by smtp.gmail.com with ESMTPSA id c6sm7791877qka.58.2020.05.03.11.22.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 May 2020 11:22:47 -0700 (PDT) From: wu000273@umn.edu To: a.zummo@towertech.it Cc: alexandre.belloni@bootlin.com, Markus.Elfring@web.de, linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org, kjlu@umn.edu, wu000273@umn.edu Subject: [PATCH v2] rtc: mc13xxx: fix a double-unlock issue Date: Sun, 3 May 2020 13:22:35 -0500 Message-Id: <20200503182235.1652-1-wu000273@umn.edu> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org From: Qiushi Wu In function mc13xxx_rtc_probe, the mc13xxx_unlock() is called before rtc_register_device(). But in the error path of rtc_register_device(), the mc13xxx_unlock() is called again, which causes a double-unlock problem. Thus add a call of the function “mc13xxx_lock” in an if branch for the completion of the exception handling. Fixes: e4ae7023e182a ("rtc: mc13xxx: set range") Signed-off-by: Qiushi Wu --- drivers/rtc/rtc-mc13xxx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/rtc/rtc-mc13xxx.c b/drivers/rtc/rtc-mc13xxx.c index afce2c0b4bd6..d6802e6191cb 100644 --- a/drivers/rtc/rtc-mc13xxx.c +++ b/drivers/rtc/rtc-mc13xxx.c @@ -308,8 +308,10 @@ static int __init mc13xxx_rtc_probe(struct platform_device *pdev) mc13xxx_unlock(mc13xxx); ret = rtc_register_device(priv->rtc); - if (ret) + if (ret) { + mc13xxx_lock(mc13xxx); goto err_irq_request; + } return 0; -- 2.17.1