Received: by 2002:a05:6358:795:b0:dc:4c66:fc3e with SMTP id n21csp411678rwj; Sat, 29 Oct 2022 05:17:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM55xBtLfFZwhb0LoN0QaEcy0JUAfEgTyvt/0+q3ubVhehM3FmPvBtQ7d/h2BtvjH769OVKf X-Received: by 2002:a17:907:6d19:b0:7ad:b5f1:8ffb with SMTP id sa25-20020a1709076d1900b007adb5f18ffbmr1474038ejc.187.1667045830878; Sat, 29 Oct 2022 05:17:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667045830; cv=none; d=google.com; s=arc-20160816; b=J9qi25SPx16Sk0XPPPiezGmJfBSbCuskMi71b4fmE7H0mAs/SB3XRFA3VlA+7ZKKrx 5+hJPDkucxkJoUxxXGXfdOauNemQb7sxvrJXsqPzOEkAXQpVv8sUUI0iZHRHKITeEQZk OFLBTZb2+65dCRd47uUWiT+zjOAB1cz3dV7LLM/GvkLGStYiFFIsw4Sv80BbGXXg0MhO QmhvjHB07DYnxVqVtAy+uewkY9ZBkN9WKaxP+8xJJ/UoJKhDJ65UvkGZPuFMLZhR9Wwr xwncJF4OEGW8YMnw0UEwGoO57iuzx2JBjAbGtzZVXSbeqiPx8q2IisVCg0dPoeMJZ8CF 4ZRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=+ihIJ4AX57RwEW2cpPpXogoIxk0B5CmjjGUFM9ffxCo=; b=ZuFJJcfi0/0p8RpAq+UEzFynQuogASF/BvuMoYAHX6MVdkcPvVy7B6GaK4p0mheBBq eYUg/exowFb0CTQ+KthLFzk4c2TEsU3amT5UKDkTAx0XZ7Qm54RpScnds8ZHKzlqagDz e5BFfW0zvEQgvCBXjDL0z+Lm7/urnBGEXWrNJDte9r87bLZt+MgocGbwCuCXmvUWYibt lufIl6ru29VNuCdVHjNDDuYIPmA0SSIVXC9owO8oNP+IFPuDQ+JDa/YvjaA8RhTRMCzB Fys/oeI7oT10MRpjrxJETgZhlnme68WU5quLf04FbAwJh0wKmP83mEHW9hz3JAI5SDsN u4ug== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k2-20020a17090632c200b00781d82a6fc9si1173197ejk.264.2022.10.29.05.16.42; Sat, 29 Oct 2022 05:17:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229658AbiJ2Lpe (ORCPT + 99 others); Sat, 29 Oct 2022 07:45:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229645AbiJ2Lpb (ORCPT ); Sat, 29 Oct 2022 07:45:31 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEB694D4C4 for ; Sat, 29 Oct 2022 04:45:28 -0700 (PDT) Received: from dggpemm500022.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4MzyCK0Qhsz15MFW; Sat, 29 Oct 2022 19:40:29 +0800 (CST) Received: from dggpemm500007.china.huawei.com (7.185.36.183) by dggpemm500022.china.huawei.com (7.185.36.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 29 Oct 2022 19:45:25 +0800 Received: from huawei.com (10.175.103.91) by dggpemm500007.china.huawei.com (7.185.36.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 29 Oct 2022 19:45:25 +0800 From: Yang Yingliang To: CC: , , Subject: [PATCH v2] clocksource/drivers/timer-ti-dm: fix missing clk_disable_unprepare in dmtimer_systimer_init_clock() Date: Sat, 29 Oct 2022 19:44:27 +0800 Message-ID: <20221029114427.946520-1-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500007.china.huawei.com (7.185.36.183) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If clk_get_rate() fails which is called after clk_prepare_enable(), clk_disable_unprepare() need be called in error path to disable the clock in dmtimer_systimer_init_clock(). Fixes: 52762fbd1c47 ("clocksource/drivers/timer-ti-dm: Add clockevent and clocksource support") Signed-off-by: Yang Yingliang --- v1 -> v2: Add fix tag. v1 patch link: https://lore.kernel.org/lkml/20220514084008.680446-1-yangyingliang@huawei.com/ --- drivers/clocksource/timer-ti-dm-systimer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/clocksource/timer-ti-dm-systimer.c b/drivers/clocksource/timer-ti-dm-systimer.c index 2737407ff069..632523c1232f 100644 --- a/drivers/clocksource/timer-ti-dm-systimer.c +++ b/drivers/clocksource/timer-ti-dm-systimer.c @@ -345,8 +345,10 @@ static int __init dmtimer_systimer_init_clock(struct dmtimer_systimer *t, return error; r = clk_get_rate(clock); - if (!r) + if (!r) { + clk_disable_unprepare(clock); return -ENODEV; + } if (is_ick) t->ick = clock; -- 2.25.1