From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 114056D09 for ; Sat, 3 Apr 2021 09:14:41 +0000 (UTC) Received: by mail-wr1-f51.google.com with SMTP id v11so6527586wro.7 for ; Sat, 03 Apr 2021 02:14:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kiJoR8904MIgGOKq2Ok4ZImHav3PFuYk8B2LeKcrr24=; b=B60Ly4RVxkdIhVjuJcoy47WPeYTRe18jBZU5eSSCbq6rtdtYm3dXa95A3EGqh4v9KU DMA73lQunAzBAgf7IZtcKmRoJp9197Q1IHRTaAJJRhzFa2jVxmw6kU9p8S6U59KYVaCr j/oIa2RBsVrcbW1AbIT2LdAm1ZyI4XgnleIqFKKsNsQAtEIoV8Cxplf5nM/1eFPKoo9o ug3I0SKmK0YIXvB1Tcx1i5b+5dtTlX0dWXOn6MRx50VO45IjR6ddDhbuwym7U6tl0yga qHt4RQc/f8IS4lHzOA3lFm+wA3+kgZP7qEB16wXX2aNzddHJE42Am1cquOdQV1c209XK cTAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kiJoR8904MIgGOKq2Ok4ZImHav3PFuYk8B2LeKcrr24=; b=ax0L/Koqo+DgWqYw4gxs1trKA+LLpmuiGghf3tZueaxI2naQ/IIVW/1fKrGBKJfsSv nhnzs8dyndlb9EHH8RXfJWY+D+J+FXrahC48hCD5u4tfqvTNLBhfiNfiW0Uwbu4R1aGg +GxBaNK0scGLKxXeZBj+8hPzeylZI76G1LjcjAx17z9RO/p6H/2/OclSD118x6nQX+ay IvWZfBa7MSbl+v790BGgUzc0hnillKXNoppJyHeiluYkKs7rc9dANOBwwyKgODdRN96z Xa5ILqwOZdOVyyA82W7ZFgEobybVm4j8UT89RJDrDroKZJDJn8Vc+MMspsF+Bs5iWrQC JFDA== X-Gm-Message-State: AOAM532W2RHw3qCyUu58tVYY3mqhYHWz7i7sOtei4wblnqQ/vZRN1YXC gMf/ejNSkDo5wyAJNByHDDM= X-Google-Smtp-Source: ABdhPJwc5Ag3BvWkx0B9nSoPWVXXQ7rwNXeQJkDBzgwi9ie37pi/sR9RiOo+QWLGOWJ1p0+5oGbjjA== X-Received: by 2002:adf:e5c8:: with SMTP id a8mr19640431wrn.352.1617441279707; Sat, 03 Apr 2021 02:14:39 -0700 (PDT) Received: from agape ([5.171.72.64]) by smtp.gmail.com with ESMTPSA id n1sm22335076wro.36.2021.04.03.02.14.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Apr 2021 02:14:39 -0700 (PDT) From: Fabio Aiuto To: gregkh@linuxfoundation.org Cc: dan.carpenter@oracle.com, joe@perches.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Fabio Aiuto , David Carpenter Subject: [PATCH v3 16/30] staging: rtl8723bs: tidy up some error handling in core/rtw_mlme.c Date: Sat, 3 Apr 2021 11:13:38 +0200 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit the RT_TRACE() output is not useful so we want to delete it. In this case there is no cleanup for rtw_cleanbss_cmd() required or even possible. I've deleted the RT_TRACE() output and added a goto unlock to show that we can't continue if rtw_createbss_cmd() fails. Suggested-by: David Carpenter Signed-off-by: Fabio Aiuto --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index e8a39519fed8..e6bced0269b1 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -815,6 +815,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) if (rtw_select_and_join_from_scanned_queue(pmlmepriv) == _SUCCESS) { _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT); } else { + u8 ret = _SUCCESS; struct wlan_bssid_ex *pdev_network = &(adapter->registrypriv.dev_network); u8 *pibss = adapter->registrypriv.dev_network.MacAddress; @@ -828,10 +829,11 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE; - if (rtw_createbss_cmd(adapter) != _SUCCESS) - ; - pmlmepriv->to_join = false; + + ret = rtw_createbss_cmd(adapter); + if (ret != _SUCCESS) + goto unlock; } } } else { @@ -877,7 +879,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) } /* DBG_871X("scan complete in %dms\n", jiffies_to_msecs(jiffies - pmlmepriv->scan_start_time)); */ - +unlock: spin_unlock_bh(&pmlmepriv->lock); rtw_os_xmit_schedule(adapter); @@ -1564,6 +1566,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) rtw_free_stainfo(adapter, psta); if (adapter->stapriv.asoc_sta_count == 1) {/* a sta + bc/mc_stainfo (not Ibss_stainfo) */ + u8 ret = _SUCCESS; /* rtw_indicate_disconnect(adapter);removed@20091105 */ spin_lock_bh(&(pmlmepriv->scanned_queue.lock)); /* free old ibss network */ @@ -1591,12 +1594,14 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) _clr_fwstate_(pmlmepriv, WIFI_ADHOC_STATE); } - if (rtw_createbss_cmd(adapter) != _SUCCESS) - ; + ret = rtw_createbss_cmd(adapter); + if (ret != _SUCCESS) + goto unlock; } } +unlock: spin_unlock_bh(&pmlmepriv->lock); } -- 2.20.1