Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp3020893pxp; Tue, 8 Mar 2022 06:24:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJzNirOfiOKG7cfO/ra2WIN58nMjqHYov1O58I4SbuDWwJdixAvms9gAYEzZCVDvP7dDzWHN X-Received: by 2002:a17:906:fc10:b0:6cd:84e:7248 with SMTP id ov16-20020a170906fc1000b006cd084e7248mr13873768ejb.281.1646749467976; Tue, 08 Mar 2022 06:24:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646749467; cv=none; d=google.com; s=arc-20160816; b=nuSB2r3llCNgMPIlPynLb6cdn4A1VUfBqkOMiRhXA8qSau+kjTzSw4olA0xdv6QyDA xrJUriQsFuvUTiJ6sgUKxEW9NcTdFk2zRexODi7k7G53otiUqBiKGXM201/PEzVAvEp0 yxtGjdJklOj+uBE5LCY7TZA8XJRI9e7g/g17QVc32tOf3swncQlGjR4Wyy2Tciqc8Dhf d1igxA34JBfUqYydXQ7Rhf6X46kG2X1ujEqQVRh1UF9JMVwRLUB7CwJUC61NSg8g0CaA S+Mdw3pdROcgHuo4YfTqKAWh7MfYrz3bMjQCNmE+cAODyIWeYOGeM0++fOJzubqy0yJ2 2ETw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=o2TUOqL7Gj4mlejca+dXKhqX+S5Wl6c+nk3MzcmnOGU=; b=RHX5YCO17U6rX86WniwOp+KI0XJCsTN1VJhwB/sYFgiydqw46jgCpYQ+HCbR0RRxYf L6FBpBb42xS8/jeFACurUOfqbwwPGuzzExuO0zxcE1/P/ENnYrk6QBIx45lC+iP4xVu8 J7GekPGy6UWeMFuttyLuC/V8dWmx99rdok6RM5I5P06ue2e18oQNXtHBiPgjnfxNDy64 gVl7HaA1+MeRl2/LG3PFwEGYtzlZnEEsZZR4ClhPJ4pXgAam988pO1kTs7qmkI+9BBX5 vMB+bZ6moLA7h2MYmhekJFL/GqoeQHPDbjb6FnMkEAna7eRoibjzHJmKt4CGmv7jvMkz kLSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=UKARoSuk; 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=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gt11-20020a1709072d8b00b006db4f4758fdsi1254326ejc.286.2022.03.08.06.24.05; Tue, 08 Mar 2022 06:24:27 -0800 (PST) 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; dkim=pass header.i=@gmail.com header.s=20210112 header.b=UKARoSuk; 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=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238221AbiCGLfn (ORCPT + 99 others); Mon, 7 Mar 2022 06:35:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237482AbiCGLfj (ORCPT ); Mon, 7 Mar 2022 06:35:39 -0500 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78407193D5; Mon, 7 Mar 2022 03:34:45 -0800 (PST) Received: by mail-pf1-x42a.google.com with SMTP id g1so13505161pfv.1; Mon, 07 Mar 2022 03:34:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=o2TUOqL7Gj4mlejca+dXKhqX+S5Wl6c+nk3MzcmnOGU=; b=UKARoSukGsSQA8t8WZtHWUTlKTCrxkNh5fCDeTQ6DDqzOk+Bt0BCvIzdh8g0siSdH3 0jVoyD/2BcWpvUeyduyX0TmdrIlsGxOCXLNboiGcXybpBl0hDDy1/S0xEL/bOQ6jDbRD UtDR07ypIbHutUZg3amRq38Rx/wRrQWiGx0SHbzKKV381/7xR4oU58tlF3fn3vFowwmY /5My+QqLOnTx/R54m7bPzpZAsL3Ezco0GajmD7ZMTnwyS2fHDu1ScDYjpaWoTuBNmR1o r0KcZ207pO1lpoxKreNxna/CQ7SUmOLdoFkVAOw+QEhpozDKz1yOQl0gH8Z6vOVm2JOk qZ8A== 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=o2TUOqL7Gj4mlejca+dXKhqX+S5Wl6c+nk3MzcmnOGU=; b=Q6RP08Y+X5U/6NP4fw6Gut+6DJwPfpkHck7bRztwWCJe/F+swxqHLg3FcGiudbYDnP +dwJEcrDvRzABU8pNHXJLAsj81N7V4iWLTzy1Wq6gnFH0m6pduRJHTj52nHElfF6KzRa tkWL+SdYl4cQHJZyqVezYARuoa3/xl6YEs9UuG5/uYAQv12GBPspEF71psNYALg8CMp0 C/JnGucg4QULbAOdh5RfJbM6QXNqdG57+a+b7qAnq7ZGXXPZzRnMNTX/lKLQ+hvJ0C6V n7hZDOJ8cACwdCSbyuITp1gXMSGj3nWDwxJk87T/bEA6QAx96G7T9hW99XSAMunUCQPr jYQQ== X-Gm-Message-State: AOAM530DD1WwhzV87jxp7JLLIhD8fdTs+E6d0DPdb3Xy6b564MG+GkyF 1Z6x61Y9lMS97OvAGEgQvnBQmmW2GOiyxOPqYFsMbg== X-Received: by 2002:a65:5bce:0:b0:372:cada:865d with SMTP id o14-20020a655bce000000b00372cada865dmr9263748pgr.199.1646652885036; Mon, 07 Mar 2022 03:34:45 -0800 (PST) Received: from localhost.localdomain ([159.226.95.43]) by smtp.googlemail.com with ESMTPSA id q12-20020a17090a178c00b001bd036e11fdsm18522965pja.42.2022.03.07.03.34.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 03:34:44 -0800 (PST) From: Miaoqian Lin To: "Rafael J. Wysocki" , Daniel Lezcano , Amit Kucheria , Zhang Rui , Matthias Brugger , Henry Yen , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Cc: linmq006@gmail.com Subject: [PATCH] thermal: mediatek: Fix some leaks in mtk_thermal_probe Date: Mon, 7 Mar 2022 11:34:38 +0000 Message-Id: <20220307113438.21338-1-linmq006@gmail.com> X-Mailer: git-send-email 2.17.1 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE 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 an error occurs after a successful 'of_iomap()' call, it must be undone by a corresponding 'iounmap()' call Fixes: 89945047b166 ("thermal: mediatek: Add tsensor support for V2 thermal system") Signed-off-by: Miaoqian Lin --- drivers/thermal/mtk_thermal.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c index ede94eadddda..9d7461a5c2c1 100644 --- a/drivers/thermal/mtk_thermal.c +++ b/drivers/thermal/mtk_thermal.c @@ -1035,13 +1035,15 @@ static int mtk_thermal_probe(struct platform_device *pdev) if (auxadc_phys_base == OF_BAD_ADDR) { dev_err(&pdev->dev, "Can't get auxadc phys address\n"); - return -EINVAL; + ret = -EINVAL; + goto err_umap_auxadc; } apmixedsys = of_parse_phandle(np, "mediatek,apmixedsys", 0); if (!apmixedsys) { dev_err(&pdev->dev, "missing apmixedsys node\n"); - return -ENODEV; + ret = -ENODEV; + goto err_umap_auxadc; } apmixed_base = of_iomap(apmixedsys, 0); @@ -1051,17 +1053,18 @@ static int mtk_thermal_probe(struct platform_device *pdev) if (apmixed_phys_base == OF_BAD_ADDR) { dev_err(&pdev->dev, "Can't get auxadc phys address\n"); - return -EINVAL; + ret = -EINVAL; + goto err_umap_apmixed; } ret = device_reset_optional(&pdev->dev); if (ret) - return ret; + goto err_umap_apmixed; ret = clk_prepare_enable(mt->clk_auxadc); if (ret) { dev_err(&pdev->dev, "Can't enable auxadc clk: %d\n", ret); - return ret; + goto err_umap_apmixed; } ret = clk_prepare_enable(mt->clk_peri_therm); @@ -1099,6 +1102,10 @@ static int mtk_thermal_probe(struct platform_device *pdev) clk_disable_unprepare(mt->clk_peri_therm); err_disable_clk_auxadc: clk_disable_unprepare(mt->clk_auxadc); +err_umap_apmixed: + iounmap(apmixed_base); +err_umap_auxadc: + iounmap(auxadc_base); return ret; } -- 2.17.1