From nobody Sun Feb 8 17:55:06 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBCB9C7EE26 for ; Sat, 20 May 2023 07:29:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230194AbjETH3y (ORCPT ); Sat, 20 May 2023 03:29:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230256AbjETH3w (ORCPT ); Sat, 20 May 2023 03:29:52 -0400 Received: from smtp.smtpout.orange.fr (smtp-14.smtpout.orange.fr [80.12.242.14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0F93F7 for ; Sat, 20 May 2023 00:29:50 -0700 (PDT) Received: from pop-os.home ([86.243.2.178]) by smtp.orange.fr with ESMTPA id 0H2BqV9zozy2w0H2BqUapd; Sat, 20 May 2023 09:29:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1684567788; bh=ID4WM8xku7YVOObLJl5OYwASYrgepFft1NaI5Zy1PNI=; h=From:To:Cc:Subject:Date; b=VmU0kId+aJ2dOQ4oUsxNlyGPlcgguYRiJ97KQDbabwsqqkP9HVq8RHBFL2mMS5dSP QdxM487/11CkfUKMVBAo0GX+dtyeJudmly5g7RL/p/jYeFSp1faJZ9NVWNgHljIGPA EXCirkDw9g1S7iP5vGjAQ8R9l6SBSj3kEbcCg+TqQBfyIUSwSzfBo/nhiIGaeuOr00 3693OtpJyjGA+AdIHYEy7VUNP2w2J417ZHa/x9o3B/JE/0mB2u83wJ1toAnugLLTr1 SWjBHXWgAD/S3e+Dx/DkS1izhU9s8I9xOJTqH5UuvP8+gm5xQ/6Sf3kDyfpYYxtz8I rTffN2ZNbXB9Q== X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 20 May 2023 09:29:48 +0200 X-ME-IP: 86.243.2.178 From: Christophe JAILLET To: Kalle Valo , Dominik Brodowski Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , linux-wireless@vger.kernel.org Subject: [PATCH wireless] orinoco: Fix an error handling path in spectrum_cs_probe() Date: Sat, 20 May 2023 09:29:46 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Should spectrum_cs_config() fail, some resources need to be released as already done in the remove function. While at it, remove a useless and erroneous comment. The probe is spectrum_cs_probe(), not spectrum_cs_attach(). Fixes: 15b99ac17295 ("[PATCH] pcmcia: add return value to _config() functio= ns") Signed-off-by: Christophe JAILLET Reviewed-by: Simon Horman --- drivers/net/wireless/intersil/orinoco/spectrum_cs.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/intersil/orinoco/spectrum_cs.c b/drivers/= net/wireless/intersil/orinoco/spectrum_cs.c index 291ef97ed45e..841d623c621a 100644 --- a/drivers/net/wireless/intersil/orinoco/spectrum_cs.c +++ b/drivers/net/wireless/intersil/orinoco/spectrum_cs.c @@ -157,6 +157,7 @@ spectrum_cs_probe(struct pcmcia_device *link) { struct orinoco_private *priv; struct orinoco_pccard *card; + int ret; =20 priv =3D alloc_orinocodev(sizeof(*card), &link->dev, spectrum_cs_hard_reset, @@ -169,8 +170,16 @@ spectrum_cs_probe(struct pcmcia_device *link) card->p_dev =3D link; link->priv =3D priv; =20 - return spectrum_cs_config(link); -} /* spectrum_cs_attach */ + ret =3D spectrum_cs_config(link); + if (ret) + goto err_free_orinocodev; + + return 0; + +err_free_orinocodev: + free_orinocodev(priv); + return ret; +} =20 static void spectrum_cs_detach(struct pcmcia_device *link) { --=20 2.34.1