Commit 4708cac0e22c for kernel

commit 4708cac0e22cfd217f48f7cec3c35e5922efcccd
Merge: 0000d9ccbcfa 7cb1c5b32a2b
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Jun 22 12:43:16 2026 -0700

    Merge tag 'staging-7.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

    Pull staging driver updates from Greg KH:
     "Here is the big set of staging driver updates for 7.2-rc1.

      Nothing major in here, just constant grind of tiny cleanups and coding
      style fixes and wrapper removals. Overall more code was removed than
      added, always a nice sign that things are progressing forward.

      Changes outside of drivers/staging/ was due to the octeon driver
      changes, which for some reason also lives partially in the mips
      subsystem, someday that all will be untangled and cleaned up, or just
      removed entirely, it's hard to tell which is going to be its fate.

      Other than octeon driver cleanups, in here are the usual:

       - rtl8723bs driver reworking and cleanups, being the bulk of this
         merge window given all of the issues and wrappers involved in that
         beast of a driver

       - most driver cleanups

       - sm750fb driver cleanups (which might be done, as this really should
         be moved to the drm layer one of these days...)

       - other tiny staging driver cleanups and fixes

      All of these have been in linux-next for many weeks with no reported
      issues"

    * tag 'staging-7.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (199 commits)
      staging: most: video: avoid double free on video register failure
      staging: sm750: rename CamelCase variable Bpp to bpp
      staging: rtl8723bs: delete superfluous switch statement
      staging: sm750fb: Mark g_noaccel, g_nomtrr and g_dualview as __ro_after_init
      staging: rtl8723bs: propagate errno through hal xmit path
      staging: rtl8723bs: propagate errno through xmit enqueue path
      staging: rtl8723bs: convert rtw_xmit_classifier to return errno
      staging: rtl8723bs: make rtw_xmit_classifier static
      staging: rtl8723bs: simplify rtw_xmit_classifier control flow
      staging: rtl8723bs: make _rtw_enqueue_cmd return 0 on success
      staging: rtl8723bs: simplify rtw_enqueue_cmd control flow
      staging: rtl8723bs: make _rtw_enqueue_cmd static
      staging: rtl8723bs: simplify _rtw_enqueue_cmd control flow
      staging: rtl8723bs: fix multiple blank lines in more hal/ files
      staging: rtl8723bs: remove unused TXDESC_64_BYTES code
      staging: rtl8723bs: remove unused DBG_XMIT_BUF and DBG_XMIT_BUF_EXT code
      staging: rtl8723bs: fix multiple blank lines in hal/Hal* files
      staging: rtl8723bs: fix multiple blank lines in hal/ files
      staging: rtl8723bs: rtw_mlme: add blank line for readability
      staging: rtl8723bs: rtw_mlme: wrap rtw_sitesurvey_cmd condition
      ...

diff --cc drivers/staging/rtl8723bs/core/rtw_mlme.c
index 9f21a2226dbd,4fb74729180f..1196ec011455
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@@ -457,18 -454,10 +454,13 @@@ static void update_current_network(stru
  {
  	struct	mlme_priv *pmlmepriv = &adapter->mlmepriv;

- 	rtw_bug_check(&pmlmepriv->cur_network.network,
- 		&pmlmepriv->cur_network.network,
- 		&pmlmepriv->cur_network.network,
- 		&pmlmepriv->cur_network.network);
-
  	if (check_fwstate(pmlmepriv, _FW_LINKED) && (is_same_network(&pmlmepriv->cur_network.network, pnetwork, 0))) {
  		update_network(&pmlmepriv->cur_network.network, pnetwork, adapter, true);
 +		if (pmlmepriv->cur_network.network.ie_length < sizeof(struct ndis_802_11_fix_ie))
 +			return;
 +
  		rtw_update_protection(adapter, (pmlmepriv->cur_network.network.ies) + sizeof(struct ndis_802_11_fix_ie),
 -								pmlmepriv->cur_network.network.ie_length);
 +								pmlmepriv->cur_network.network.ie_length - sizeof(struct ndis_802_11_fix_ie));
  	}
  }