From nobody Wed Apr 1 11:11:03 2026 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 684D0413223 for ; Tue, 31 Mar 2026 15:33:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774971202; cv=none; b=jXDJpz83FBpel/p7DZ75xtTB/D4SuhsgGJXWy/d6UiGd3HIyBcJSS13CSrWLh4Reo05gXYK6g6QHWs93+Pah+YXaQQExsEZoPw8hfTNx8WLj/9iX1/5NX+BNAoNuc7fLsJ+gOuTm6fv3FQhe6VXeW++wGcuS53CjeMtO4iXLvp8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774971202; c=relaxed/simple; bh=+QLp+W+N/h7ONWCYZjLE/LwSDtdFmevLfErmTRH22Rc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KfoEke5LMMUldcMFubYJWoQqAzFmsefd0oaoWDFYVCx+MjdO4oPeEAyDXtoX+/aJp5Ra9w+fncM91BwKAp3Fyq8/5/nGwM/y0NU9I8OtuRP9XTDC3nJUQjR8K8NIMD9GXycpep6us2tQ4+SCOj3iDfxXkbU1EE6txdgJeklgwko= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=QlEX9Juw; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QlEX9Juw" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4888244e9f9so1802455e9.0 for ; Tue, 31 Mar 2026 08:33:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774971189; x=1775575989; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZJutMm6/Y5MNx7yEDzl3x8JS0IdVhmYLXjsl5fR/2SQ=; b=QlEX9Juw/MdjHrcdXnqDxi+3usK3DzoOLqhFlw+PUmEcKJzRh/RGlwHryOLdirjjiz MBvlzxNeRr3EybCd8ti2CD8dL9rKWlBLRLQQGzrUcDBeWoh8J/t13/zrD0AIy/FOkvBV M4nMnTaEmqzJUuZI6iuTa34Pu2+T7mUnfxosjQZh04x3L4pBC7HqWpoyMsiejl6fwyKK QlsP0ExktJG13xdh19Ty5TF4wRVp5/PYzaWm5WUTyG23P6o6egs/8qlfRwA+55dfIIB7 +FJfWHK25sEYpJPRxJ56ifaM1feCH0YgOqmuQx2HBCtoR3ln4p5J1rO0AGdor7S7YBMU FQSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774971189; x=1775575989; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ZJutMm6/Y5MNx7yEDzl3x8JS0IdVhmYLXjsl5fR/2SQ=; b=Rr1FHYlGCoYBIfbX5Bbs/Cv+q6Ht+zvbfGv5JTL6cO2uL7tr2TT+DHslWK1nx0jk1+ YulMcIZWrrPQDmhBbIi6vUla3xZJXYPCpj8W6TdD1501l+i/zVlqw9XmxS4BZIBYnP50 oZFy7M9f36mL2U0BryjHq7tPiXU76oewnZ8ER0+olQk3o0uM3V9e3OLKaB0Tfaw/6Pno CdnFHGE59iwPTaIHFwS1X77ioLEszLWVYv3OGfXp1hpow2jEVRIIuCF/2Zs83vgDBy1s 6+Yd8GkxXZzLzUC3DTzfgYValIQa9Ryx51y3wluANFlOVt0jXgFBjBjWDiU5o5W/btSe wmoQ== X-Forwarded-Encrypted: i=1; AJvYcCWeP+2GJj5MEt5M6L7j+ksqMfM60sbr9DfRZJjM5IYVc75rh1himOUd4zNURsgg9LfJHjXQh4Ol2RTcrmc=@vger.kernel.org X-Gm-Message-State: AOJu0Yz43m2Tir3IJBxs7e+jQLEWSiq1nBNVRh+cwOp71N8pU5SAC2ry oGS6rCPo8EUzmu9Y3Bo1LLXI7iyh7dTHWOql2Ka+OvaGwP76FQXkan5GXJIiypC3 X-Gm-Gg: ATEYQzyzlzW5C50F1xzX2zmtww/TLpI37oKj/tbcgAsRiZK7lfRQJjy0FhtzylWHweq RuzjNRQrHLgTkxLoxRC0jEh+6M5Bcr4eIPFOtCdwMOW/V+Lgctg6B34meLSBnPYybirMth/8c+e 8YF7mdWgdbGtR6sb2Ke+9Wt9eNdet32+uqjtPGiFXVNcK1twJIncSdIygajGG1Mr7+MNq26r6BD J9sw3O0+h40iczkvSa6OWfTgPHUKeidw4V5QG4hCUS9I2WKA+LxgbxDMOJjgZDRP1AL2/1Fc1NG OSQD2Bgi1t+Wj8zmAnC4NAdiXGnzIfN8CQEEL6OVQiQ1vg5Tqx69BV1IO7ZrwllLCixKK/oeosD tVn/tfpux2OPcZMbE1mee8F39gg+pY9q8nBKLXCuCoqL6/GtyLceUs3GESEXaty9HCDFGFUtG+s S+boGJTQRmnBvzheUJ/t9w5Q== X-Received: by 2002:a05:600c:4f91:b0:486:fb69:4960 with SMTP id 5b1f17b1804b1-48727edde49mr272182805e9.19.1774971188933; Tue, 31 Mar 2026 08:33:08 -0700 (PDT) Received: from potato ([31.176.162.65]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4887aceb230sm21653485e9.4.2026.03.31.08.33.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 08:33:08 -0700 (PDT) From: Omer El Idrissi To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Omer El Idrissi Subject: [PATCH 5/5] staging: rtl8723bs: add separate label for freeing rtw_wdev Date: Tue, 31 Mar 2026 17:32:54 +0200 Message-ID: <20260331153255.22764-6-omer.e.idrissi@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260331153255.22764-1-omer.e.idrissi@gmail.com> References: <20260331153255.22764-1-omer.e.idrissi@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The original function would "unregister" and "free" padapter->rtw_wdev IF it ran into issues after "hardware operation functions" were set. The problem is that rtw_wdev isn't even allocated at that point. So separate the rtw_wdev_unregister and rtw_wdev_free code into it's own label, add error check to rtw_wdev_alloc and move it up a bit. When rtw_init_drv_sw fails goto free_wdev instead of free_hal_data. Signed-off-by: Omer El Idrissi --- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging= /rtl8723bs/os_dep/sdio_intf.c index aea9b4e19874..a088dae40a19 100644 --- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c +++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c @@ -268,12 +268,13 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj= _priv *dvobj, const struct =20 /* 3 6. read efuse/eeprom data */ rtw_hal_read_chip_info(padapter); +=09 + if (rtw_wdev_alloc(padapter, dvobj_to_dev(dvobj)))=20 + goto free_hal_data; =20 /* 3 7. init driver common data */ if (rtw_init_drv_sw(padapter)) - goto free_hal_data; - - rtw_wdev_alloc(padapter, dvobj_to_dev(dvobj)); + goto free_wdev; =20 /* 3 8. get WLan MAC address */ /* set mac addr */ @@ -283,12 +284,13 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj= _priv *dvobj, const struct =20 return padapter; =20 -free_hal_data: - kfree(padapter->HalData); - +free_wdev: rtw_wdev_unregister(padapter->rtw_wdev); rtw_wdev_free(padapter->rtw_wdev); =20 +free_hal_data: + kfree(padapter->HalData); + free_adapter: if (pnetdev) rtw_free_netdev(pnetdev); --=20 2.51.0