From patchwork Mon Oct 24 09:02:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongliang Mu X-Patchwork-Id: 8276 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp337679wru; Mon, 24 Oct 2022 02:09:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7ukjFRFCFH34WtynI6vbTtHwy/aIUIlb8dSBflV3NDKA9nk+riCs+aBAKSi+IyEMNXgHSK X-Received: by 2002:a17:907:31c9:b0:740:ef93:2ffd with SMTP id xf9-20020a17090731c900b00740ef932ffdmr27076129ejb.584.1666602581015; Mon, 24 Oct 2022 02:09:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666602581; cv=none; d=google.com; s=arc-20160816; b=cMf6+gcw2EMKdrc2TYSJ6EEmiAdbTbJMoO2pPtVfccIy+jNLfSSchlLyg1woh0gd1o N+zbBkd6zds7wFoh7CO33STV56qNm7mrsM5uqpvjCjELN/HK7At08V+A1LODPMM1FArb 9OLLagAidD5Vt7Fq6Q+oqu7eGS6aTte7KdcVYOJzQWti0OWerk8GevsIl3MeT/EWz8n9 nflEhaGceselsI03awjQ7Z9/cEt0WTS0pDBG85JOQQ4naUaGZeFk97H6abU4JRxspdW8 HdHUAA21HnOBIei91lhsiD4ZnXtVXKLdPcVBgiXiwboXjMf4ODY3ucg9sZVDu+8LjGLF zqwA== 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=kfAFAq6pnQ8NuYEg6wo4bQGsV2vWx4QgAGHrOd9qCOo=; b=jQ028gzc9jhEe09TE8oCmlHa4bM0qRI3UybZyrQw/U71aSwh1yN9GRYCewWdegGS6q KheU2zOQNfpNaNjz4jixqwLspf/xb3q3YqBwIA5sLp8zqvt2l97uU0lhTg0oQpgRPvsP JZbo3FwrkJRxwIAc5PkjpeN3xlfXjOjiqlpeMyQMjXNc6fotXDvsSlzEiGfVYB3ScLDy +sFkBCyb+2nPMEhKkh4+PQLrnV2dXH1tGS/y5Kwk7q6NhQ15qpdgltzA7BV/POfA+ipQ JAfxODGLgszyPlazsVMOtUuL2TcWwv9VdT+yG2d4Az0RTGpi2Efsk1prxoFZ/l3e68CH xeNw== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qa6-20020a170907868600b007836ec6999dsi28412500ejc.904.2022.10.24.02.09.17; Mon, 24 Oct 2022 02:09:41 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230248AbiJXJHw (ORCPT + 99 others); Mon, 24 Oct 2022 05:07:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231128AbiJXJHi (ORCPT ); Mon, 24 Oct 2022 05:07:38 -0400 Received: from hust.edu.cn (unknown [202.114.0.240]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 331E012D33; Mon, 24 Oct 2022 02:07:19 -0700 (PDT) Received: from localhost.localdomain ([172.16.0.254]) (user=dzm91@hust.edu.cn mech=LOGIN bits=0) by mx1.hust.edu.cn with ESMTP id 29O94ftr027533-29O94ftu027533 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 24 Oct 2022 17:04:45 +0800 From: Dongliang Mu To: Wolfgang Grandegger , Marc Kleine-Budde , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Vincent Mailhol , =?utf-8?q?Stefan_M=C3=A4tje?= , Andy Shevchenko , Oliver Hartkopp , =?utf-8?q?Sebastian_W=C3=BCrl?= , Dongliang Mu , Sebastian Andrzej Siewior , =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , =?utf-8?q?Timo_Schl?= =?utf-8?q?=C3=BC=C3=9Fler?= Cc: linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] can: mcp251x: fix error handling code in mcp251x_can_probe Date: Mon, 24 Oct 2022 17:02:52 +0800 Message-Id: <20221024090256.717236-1-dzm91@hust.edu.cn> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-FEAS-AUTH-USER: dzm91@hust.edu.cn X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, 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?1747559468188519397?= X-GMAIL-MSGID: =?utf-8?q?1747559468188519397?= In mcp251x_can_probe, if mcp251x_gpio_setup fails, it forgets to unregister the can device. Fix this by unregistering can device in mcp251x_can_probe. Fixes: 2d52dabbef60 ("can: mcp251x: add GPIO support") Signed-off-by: Dongliang Mu --- v1->v2: add fixes tag drivers/net/can/spi/mcp251x.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c index c320de474f40..00ed46683656 100644 --- a/drivers/net/can/spi/mcp251x.c +++ b/drivers/net/can/spi/mcp251x.c @@ -1415,11 +1415,14 @@ static int mcp251x_can_probe(struct spi_device *spi) ret = mcp251x_gpio_setup(priv); if (ret) - goto error_probe; + goto err_reg_candev; netdev_info(net, "MCP%x successfully initialized.\n", priv->model); return 0; +err_reg_candev: + unregister_candev(net); + error_probe: destroy_workqueue(priv->wq); priv->wq = NULL;