From patchwork Fri Nov 11 12:08:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Changzhong X-Patchwork-Id: 18702 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp693016wru; Fri, 11 Nov 2022 03:51:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf6WyXoK2UZ93G08EmQtWFGaJ15St8v92NpKjfs9/+ynALtgJ3T29FcXFLE4WuhrIlRBDWOD X-Received: by 2002:a17:906:9f04:b0:7ae:ed2:5367 with SMTP id fy4-20020a1709069f0400b007ae0ed25367mr1547923ejc.521.1668167497158; Fri, 11 Nov 2022 03:51:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668167497; cv=none; d=google.com; s=arc-20160816; b=gn2matUqkEb2+g/mk+ImpYRYQIy+JQ9E5F9QjSW/D1OQ56SibHqpSX5Hv9ih1p0y6c HGAJU2a9kV7Ks4UJfLFobffIxPlFyniFA8yFobzyVBeK5n425+NRdou8FShuuZmSY/CY zmyfhyhPyV0ubzu6ClnCVuIXL04B/Ucc2JKhdMqXtCioZ29mU87bUBZ46o5Z+zdxofDv 6Ij8dxhzCieS6aDKhN4E785dnH5CIR9aMMXXhRBMrgj4T9CSjSW6aauGhH0UIEcHlLMF 3LVNMWoucLfl/ClCtyZbUcKogfyunFWMPlOA+3mzUSDoLxK7na58VvecQXmIoo8u43eF 6fhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=rWO6FN150Ryt/TZCdYxNiOu0W8jzdrmvbi2GKndld6U=; b=FJHVUZbrZs42JZPFOPLJtBcMJUU2H0qLS4v7xjlhwK5s7vbOy/7iy2L4WM+W6IuumX 1DC7y3qYuPFNORNfYrvvcsnLrBE6xDoJd7Gob3DaUaYxW97j0xr4t5nOk8u6dBGTxKp/ CJjc7EWhp4/WgblP2Hunw6pu3VQRvI3x3AyFtmg8NXgiGXkUglNc/K4d88YAwKpC82L+ jwfebkvTOySxxA86tJRNhO+rkX5I3LfkmosXkLv6OmRTCblBQZkYzPVy2KbqY+M5s0Ib y2DxNUZ6QVIJtouO35LdHHvu7GmmEmvoqZo/U+jO2d+s/LgzloFp2sJia7vQEOzrcJUS sYtA== 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 e18-20020a50ec92000000b004617551556csi1817220edr.128.2022.11.11.03.51.14; Fri, 11 Nov 2022 03:51:37 -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 S233318AbiKKLss (ORCPT + 99 others); Fri, 11 Nov 2022 06:48:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233278AbiKKLsq (ORCPT ); Fri, 11 Nov 2022 06:48:46 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 551053896; Fri, 11 Nov 2022 03:48:44 -0800 (PST) Received: from dggpeml500020.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4N7xmW39lRz15M2Q; Fri, 11 Nov 2022 19:48:27 +0800 (CST) Received: from dggpeml500006.china.huawei.com (7.185.36.76) by dggpeml500020.china.huawei.com (7.185.36.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 11 Nov 2022 19:48:42 +0800 Received: from localhost.localdomain (10.175.112.70) by dggpeml500006.china.huawei.com (7.185.36.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 11 Nov 2022 19:48:41 +0800 From: Zhang Changzhong To: Wolfgang Grandegger , Marc Kleine-Budde , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni CC: Zhang Changzhong , , , Subject: [PATCH 1/3] can: sja1000_isa: add missing free_sja1000dev() in sja1000_isa_probe() Date: Fri, 11 Nov 2022 20:08:41 +0800 Message-ID: <1668168521-5540-1-git-send-email-zhangchangzhong@huawei.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.175.112.70] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpeml500006.china.huawei.com (7.185.36.76) 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?1749200401133383588?= X-GMAIL-MSGID: =?utf-8?q?1749200401133383588?= Add the missing free_sja1000dev() before return from sja1000_isa_probe() in the register_sja1000dev() error handling case. In addition, remove blanks before goto labels. Fixes: 2a6ba39ad6a2 ("can: sja1000: legacy SJA1000 ISA bus driver") Signed-off-by: Zhang Changzhong --- drivers/net/can/sja1000/sja1000_isa.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/can/sja1000/sja1000_isa.c b/drivers/net/can/sja1000/sja1000_isa.c index d513fac..db3e767 100644 --- a/drivers/net/can/sja1000/sja1000_isa.c +++ b/drivers/net/can/sja1000/sja1000_isa.c @@ -202,22 +202,24 @@ static int sja1000_isa_probe(struct platform_device *pdev) if (err) { dev_err(&pdev->dev, "registering %s failed (err=%d)\n", DRV_NAME, err); - goto exit_unmap; + goto exit_free; } dev_info(&pdev->dev, "%s device registered (reg_base=0x%p, irq=%d)\n", DRV_NAME, priv->reg_base, dev->irq); return 0; - exit_unmap: +exit_free: + free_sja1000dev(dev); +exit_unmap: if (mem[idx]) iounmap(base); - exit_release: +exit_release: if (mem[idx]) release_mem_region(mem[idx], iosize); else release_region(port[idx], iosize); - exit: +exit: return err; } From patchwork Fri Nov 11 12:09:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Changzhong X-Patchwork-Id: 18704 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp693581wru; Fri, 11 Nov 2022 03:53:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf7WefgJc9iY4gMQdZlvluwVB75f3xb/UdP5JlwfajA4oYcI6KS6A/hwPEzjwSCCIKRHvJro X-Received: by 2002:a17:903:446:b0:17f:74f8:c0ca with SMTP id iw6-20020a170903044600b0017f74f8c0camr2000432plb.169.1668167596058; Fri, 11 Nov 2022 03:53:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668167596; cv=none; d=google.com; s=arc-20160816; b=GEHZo/KlY+h+3NR4RLAVc3Kg93xDmzwTemIpvCVffeHfk8m3LYSYREZ4ld5xz03IXS 993JzCDLPy/rLk/FTC59CWZayGeLMl8R5Q+sMKrFSVU1HROqSJGPc38p9GFmYr+Ka5as acDyifDK21y1bRzqh4nQnPktI8ZkvgHByd8Ta70s4Ju5S3OBry1KdGfHiD5e/qnFA2si sJyoybBIyRCqGcNos01+yPD17SBoWg4QyH+ynAsp/a30v8NggMTHSWzQnt9qJOUgqSaS 0SNNxY0KVQp6N+s8JlGRI5GrBbfZhJBBU9CtmtVE+XRQRmyN27c9IwMEdhKzPR1YhVzu hl+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=FHsYM1mNXd/B/8+Htb7eM0mqlGV3SaZUuqxCZ2UzmNc=; b=0xSgbzJYCd4JdMiStGX2i92bOIb9EqQJlThx9uhXvS4qa3kILM4sTZNAQz7mpW+Dnb WlKWscbvIKqMWj1Hupuf5YpvAL4lUZYMK7XVBJRk4aP/m+ZPjWQ3v3POD6g9P/a6tfO7 b5w5qJclJtPhZWEFeDU7n3Nt4Ovb434jji6jIQzWJF4KdaIGSs3jJxhg9UQGJNE7ENvm l0H/zJfyeOKGzyYYhoyS6oroAcE4W+Tq92ZifbWmodfLUUZ/pz2LvL+lquLYy1/0+X7Y l0AcY9Y5XE6CIQSzRRp25+uEUDmj9Zrzj9wvi8Up2k8N5o3kWBo0/r48TlqZhzzsy0ay xPxA== 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 21-20020a170902c15500b00187052a749dsi2122319plj.413.2022.11.11.03.53.03; Fri, 11 Nov 2022 03:53:16 -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 S233398AbiKKLtK (ORCPT + 99 others); Fri, 11 Nov 2022 06:49:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233320AbiKKLtD (ORCPT ); Fri, 11 Nov 2022 06:49:03 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7970E27FF9; Fri, 11 Nov 2022 03:49:00 -0800 (PST) Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4N7xjZ5qGxzJnZ2; Fri, 11 Nov 2022 19:45:54 +0800 (CST) Received: from dggpeml500006.china.huawei.com (7.185.36.76) by dggpeml500022.china.huawei.com (7.185.36.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 11 Nov 2022 19:48:58 +0800 Received: from localhost.localdomain (10.175.112.70) by dggpeml500006.china.huawei.com (7.185.36.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 11 Nov 2022 19:48:57 +0800 From: Zhang Changzhong To: Wolfgang Grandegger , Marc Kleine-Budde , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni CC: Zhang Changzhong , , , Subject: [PATCH 2/3] can: cc770: add missing free_cc770dev() in cc770_isa_probe() Date: Fri, 11 Nov 2022 20:09:16 +0800 Message-ID: <1668168557-6024-1-git-send-email-zhangchangzhong@huawei.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.175.112.70] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpeml500006.china.huawei.com (7.185.36.76) 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?1749200505690517166?= X-GMAIL-MSGID: =?utf-8?q?1749200505690517166?= Add the missing free_cc770dev() before return from cc770_isa_probe() in the register_cc770dev() error handling case. In addition, remove blanks before goto labels. Fixes: 7e02e5433e00 ("can: cc770: legacy CC770 ISA bus driver") Signed-off-by: Zhang Changzhong --- drivers/net/can/cc770/cc770_isa.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/can/cc770/cc770_isa.c b/drivers/net/can/cc770/cc770_isa.c index 194c86e..8f6dccd 100644 --- a/drivers/net/can/cc770/cc770_isa.c +++ b/drivers/net/can/cc770/cc770_isa.c @@ -264,22 +264,24 @@ static int cc770_isa_probe(struct platform_device *pdev) if (err) { dev_err(&pdev->dev, "couldn't register device (err=%d)\n", err); - goto exit_unmap; + goto exit_free; } dev_info(&pdev->dev, "device registered (reg_base=0x%p, irq=%d)\n", priv->reg_base, dev->irq); return 0; - exit_unmap: +exit_free: + free_cc770dev(dev); +exit_unmap: if (mem[idx]) iounmap(base); - exit_release: +exit_release: if (mem[idx]) release_mem_region(mem[idx], iosize); else release_region(port[idx], iosize); - exit: +exit: return err; } From patchwork Fri Nov 11 12:11:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Changzhong X-Patchwork-Id: 18705 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp694184wru; Fri, 11 Nov 2022 03:54:49 -0800 (PST) X-Google-Smtp-Source: AA0mqf4b6iNVuwEN29LrZyMePI/1VY3x872NYjgvFjGUo+TuXMCPe6sa7KReNo9+Mh22LeRSEsPH X-Received: by 2002:a17:903:26d2:b0:186:9ecf:94f3 with SMTP id jg18-20020a17090326d200b001869ecf94f3mr2213505plb.105.1668167689266; Fri, 11 Nov 2022 03:54:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668167689; cv=none; d=google.com; s=arc-20160816; b=gbaduoAV5tYeE9Pf186fkiFdPlUKsM56cWeGSi8OU5HqoatJQGMBj0upBH2FuzjW1J pFD3FeaB9HoCP4qUw/wNPvl+3euc93ZMbRPwW8NmKUctBTcP2TBUZTpxJ/S1A51h3Aqg MX/nTcIVElWIHbxjSKKKpihFdSBH4X3Ia44yQ03EZ/VvE2wiJbynxXD5U4OjshEYYPeO 5weqRTfwjOKXug3+Gr1Exp8jk/0Ci0Uwl4H6DKHCZHYwmNjvAtwly0ddiSy2iWDb+M01 UeJbxBNu9SOSCj++Oq04Pmq9rCMncBQ2X04uhlyJxid9ml5m21QdszHhC+h7SIp/xHbq hscA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=OiUsZVZGQtqmH2/eZbFrfMzTorfMPaDGaHPRq6fYuuQ=; b=TLAkB2ZzXcJXQ3QZOml9AtSioqFSNFCY1UICnZmxL5qXPzf84GB1gbx9wnnDBalhW3 4rjdnDlDVeKBERmgNy3aticl+TMgDiqQHVNCOvEbnqWe0RYeojoTTbxKr+F/OhAJeaOi OJm4H4oAaAQhxUZCOgQ0AubXzsZ/MsRT7nu8KdpFDFSLkjCRztH4h9hJRtE/bzif3yEc D6qRgYil3uED6glD5aW1jFDSRLqYRdjvVYjaaEWZNqO64Mj3z6O4qePhes6Yy9zvv7qp wyCOhTqYruRWV0C5oVwfUveq8LD+oGVDYC91YD/0xQOScAsehYLJbQYbfKKQnFQ+NV0h cRog== 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 n24-20020a63a518000000b004701d95bd0csi2150095pgf.431.2022.11.11.03.54.36; Fri, 11 Nov 2022 03:54:49 -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 S233498AbiKKLvL (ORCPT + 99 others); Fri, 11 Nov 2022 06:51:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233436AbiKKLvF (ORCPT ); Fri, 11 Nov 2022 06:51:05 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C249327910; Fri, 11 Nov 2022 03:51:04 -0800 (PST) Received: from dggpeml500024.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N7xq058SFzHvcV; Fri, 11 Nov 2022 19:50:36 +0800 (CST) Received: from dggpeml500006.china.huawei.com (7.185.36.76) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 11 Nov 2022 19:51:03 +0800 Received: from localhost.localdomain (10.175.112.70) by dggpeml500006.china.huawei.com (7.185.36.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 11 Nov 2022 19:51:02 +0800 From: Zhang Changzhong To: Wolfgang Grandegger , Marc Kleine-Budde , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Raymond Tan , "Felipe Balbi (Intel)" , Jarkko Nikula CC: Zhang Changzhong , , , Subject: [PATCH 3/3] can: m_can: pci: add missing m_can_class_free_dev() in probe/remove methods Date: Fri, 11 Nov 2022 20:11:23 +0800 Message-ID: <1668168684-6390-1-git-send-email-zhangchangzhong@huawei.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.175.112.70] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpeml500006.china.huawei.com (7.185.36.76) 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?1749200603241033505?= X-GMAIL-MSGID: =?utf-8?q?1749200603241033505?= In m_can_pci_remove() and error handling path of m_can_pci_probe(), m_can_class_free_dev() should be called to free resource allocated by m_can_class_allocate_dev(), otherwise there will be memleak. Fixes: cab7ffc0324f ("can: m_can: add PCI glue driver for Intel Elkhart Lake") Signed-off-by: Zhang Changzhong Reviewed-by: Jarkko Nikula --- drivers/net/can/m_can/m_can_pci.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/can/m_can/m_can_pci.c b/drivers/net/can/m_can/m_can_pci.c index 8f184a8..f2219aa 100644 --- a/drivers/net/can/m_can/m_can_pci.c +++ b/drivers/net/can/m_can/m_can_pci.c @@ -120,7 +120,7 @@ static int m_can_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) ret = pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_ALL_TYPES); if (ret < 0) - return ret; + goto err_free_dev; mcan_class->dev = &pci->dev; mcan_class->net->irq = pci_irq_vector(pci, 0); @@ -132,7 +132,7 @@ static int m_can_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) ret = m_can_class_register(mcan_class); if (ret) - goto err; + goto err_free_irq; /* Enable interrupt control at CAN wrapper IP */ writel(0x1, base + CTL_CSR_INT_CTL_OFFSET); @@ -144,8 +144,10 @@ static int m_can_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) return 0; -err: +err_free_irq: pci_free_irq_vectors(pci); +err_free_dev: + m_can_class_free_dev(mcan_class->net); return ret; } @@ -161,6 +163,7 @@ static void m_can_pci_remove(struct pci_dev *pci) writel(0x0, priv->base + CTL_CSR_INT_CTL_OFFSET); m_can_class_unregister(mcan_class); + m_can_class_free_dev(mcan_class->net); pci_free_irq_vectors(pci); }