From patchwork Wed Nov 16 10:02:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjie Ruan X-Patchwork-Id: 20859 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp59234wru; Wed, 16 Nov 2022 02:14:56 -0800 (PST) X-Google-Smtp-Source: AA0mqf402BvgaVuZ5DhkA1ZfJz+u0f1Lqi603pGLYoWnYnQnpkEvE9oQBLt6v+NjoU2xbGYM3FG7 X-Received: by 2002:aa7:ce83:0:b0:457:23cb:20ab with SMTP id y3-20020aa7ce83000000b0045723cb20abmr18085334edv.254.1668593695955; Wed, 16 Nov 2022 02:14:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668593695; cv=none; d=google.com; s=arc-20160816; b=GgS/3rqdYZHpze5qayzLgTzeumgTiftLGkH1mtaKZxaS05hpUTCbXATaAoQav6x1Nf LU8oslPFtgKeJF+5tyGpMy4jRNSkrvLnI6DcDVFT+xW6nyS/CaasNP/8iG1ryVpcgAnb vqW5Vh3UJ8jQHNdX1e0XU0nHyFGP2I/5jN/lfPIfANw7lvQEaNcen8qO2+xbaY+N7J8m c9mQRBkCyrtR9lQf0eLuo6/CaVerjnCdTiqz1JzM6rtVrIktXEWbNEoJohi5G3VyFN11 pdy3a6Ym+EefArzAkOd77orSYBl1Z4mPb9W5bQ3WoRa1oG5jJQx9dtyenODMuw9XTX8/ g8jg== 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=X229z4ODrd5eaYOLEE39UWuvp6Wy1G1fPxvWgz9IFQI=; b=A7wPMsao9Z7obVUA1hc1ziO7bCaV7Gb5aEN4rtpHMCwSK5HFkF0MFcleZrbvwSjWOF 8vSkEZEz2H5RLWg5RooM7hMr9F2WtyZBXJb4ZRouDc3zPTQNv5FS0CbhnYqIeb6ogdKL CZAa6mxHu0nGogVPPA0qnJ/q2YGhrZEhhhJhnb3wEyNACI7N9rvybVm4Ke3K5bDYqsVb ZECgER7J74npTTwpUFY+dkNVaspnlrs8mwm8d7oz1nIG0m7hvjJ9JB1CmaRrdrCBR3c3 LrHU0+jf34FHWAYYqSAeq0klGcVfdXhnnHNveg7/EELpgXstTWNWYBRiWVSQsTzgP9og bXjA== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x4-20020a1709064bc400b0077fc66b581esi11403570ejv.688.2022.11.16.02.14.31; Wed, 16 Nov 2022 02:14:55 -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; 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 S232397AbiKPKF2 (ORCPT + 99 others); Wed, 16 Nov 2022 05:05:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231847AbiKPKF0 (ORCPT ); Wed, 16 Nov 2022 05:05:26 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39A5D8F; Wed, 16 Nov 2022 02:05:25 -0800 (PST) Received: from kwepemi500008.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NBz8v1sn7zqSVQ; Wed, 16 Nov 2022 18:01:35 +0800 (CST) Received: from huawei.com (10.67.175.83) by kwepemi500008.china.huawei.com (7.221.188.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 16 Nov 2022 18:05:22 +0800 From: ruanjinjie To: , , , , , , , , CC: Subject: [PATCH RESEND] watchdog: at91sam9_wdt: use devm_request_irq to avoid missing free_irq() in error path Date: Wed, 16 Nov 2022 18:02:10 +0800 Message-ID: <20221116100210.3144478-1-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.67.175.83] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500008.china.huawei.com (7.221.188.139) 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749647155413899529?= X-GMAIL-MSGID: =?utf-8?q?1749647303286399815?= free_irq() is missing in case of error in at91_wdt_init(), use devm_request_irq to fix that. Fixes: 5161b31dc39a ("watchdog: at91sam9_wdt: better watchdog support") Signed-off-by: ruanjinjie --- drivers/watchdog/at91sam9_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index 292b5a1ca831..b9e8572c707d 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c @@ -206,7 +206,7 @@ static int at91_wdt_init(struct platform_device *pdev, struct at91wdt *wdt) "min heartbeat and max heartbeat might be too close for the system to handle it correctly\n"); if ((tmp & AT91_WDT_WDFIEN) && wdt->irq) { - err = request_irq(wdt->irq, wdt_interrupt, + err = devm_request_irq(dev, wdt->irq, wdt_interrupt, IRQF_SHARED | IRQF_IRQPOLL | IRQF_NO_SUSPEND, pdev->name, wdt);