Commit c53b3dcb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging driver fixes from Greg KH:
 "Here are three small staging driver fixes for 6.0-rc4 that resolve
  some reported problems and add some a device id:

   - new device id for r8188eu driver

   - use-after-free bugfixes for the rtl8712 driver

   - fix up firmware dependency problem for the r8188eu driver

  All of these have been in linux-next for a while with no reported
  problems"

* tag 'staging-6.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: rtl8712: fix use after free bugs
  staging: r8188eu: Add Rosewill USB-N150 Nano to device tables
  staging: r8188eu: add firmware dependency
parents 9a61442c e230a445

drivers/staging/r8188eu/os_dep/os_intfs.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ MODULE_LICENSE("GPL"); 
MODULE_DESCRIPTION("Realtek Wireless Lan Driver");

MODULE_AUTHOR("Realtek Semiconductor Corp.");

MODULE_VERSION(DRIVERVERSION);

MODULE_FIRMWARE("rtlwifi/rtl8188eufw.bin");



#define CONFIG_BR_EXT_BRNAME "br0"

#define RTW_NOTCH_FILTER 0 /* 0:Disable, 1:Enable, */

drivers/staging/r8188eu/os_dep/usb_intf.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ static struct usb_device_id rtw_usb_id_tbl[] = { 
	/*=== Realtek demoboard ===*/

	{USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8179)}, /* 8188EUS */

	{USB_DEVICE(USB_VENDER_ID_REALTEK, 0x0179)}, /* 8188ETV */

	{USB_DEVICE(USB_VENDER_ID_REALTEK, 0xffef)}, /* Rosewill USB-N150 Nano */

	/*=== Customer ID ===*/

	/****** 8188EUS ********/

	{USB_DEVICE(0x07B8, 0x8179)}, /* Abocom - Abocom */

drivers/staging/rtl8712/rtl8712_cmd.c

+0 −36
Original line number Diff line number Diff line
@@ -117,34 +117,6 @@ static void r871x_internal_cmd_hdl(struct _adapter *padapter, u8 *pbuf) 
	kfree(pdrvcmd->pbuf);

}



static u8 read_macreg_hdl(struct _adapter *padapter, u8 *pbuf)

{

	void (*pcmd_callback)(struct _adapter *dev, struct cmd_obj	*pcmd);

	struct cmd_obj *pcmd  = (struct cmd_obj *)pbuf;



	/*  invoke cmd->callback function */

	pcmd_callback = cmd_callback[pcmd->cmdcode].callback;

	if (!pcmd_callback)

		r8712_free_cmd_obj(pcmd);

	else

		pcmd_callback(padapter, pcmd);

	return H2C_SUCCESS;

}



static u8 write_macreg_hdl(struct _adapter *padapter, u8 *pbuf)

{

	void (*pcmd_callback)(struct _adapter *dev, struct cmd_obj	*pcmd);

	struct cmd_obj *pcmd  = (struct cmd_obj *)pbuf;



	/*  invoke cmd->callback function */

	pcmd_callback = cmd_callback[pcmd->cmdcode].callback;

	if (!pcmd_callback)

		r8712_free_cmd_obj(pcmd);

	else

		pcmd_callback(padapter, pcmd);

	return H2C_SUCCESS;

}



static u8 read_bbreg_hdl(struct _adapter *padapter, u8 *pbuf)

{

	struct cmd_obj *pcmd  = (struct cmd_obj *)pbuf;
@@ -213,14 +185,6 @@ static struct cmd_obj *cmd_hdl_filter(struct _adapter *padapter, 
	pcmd_r = NULL;



	switch (pcmd->cmdcode) {

	case GEN_CMD_CODE(_Read_MACREG):

		read_macreg_hdl(padapter, (u8 *)pcmd);

		pcmd_r = pcmd;

		break;

	case GEN_CMD_CODE(_Write_MACREG):

		write_macreg_hdl(padapter, (u8 *)pcmd);

		pcmd_r = pcmd;

		break;

	case GEN_CMD_CODE(_Read_BBREG):

		read_bbreg_hdl(padapter, (u8 *)pcmd);

		break;