tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+2
-36
+1
drivers/staging/r8188eu/os_dep/os_intfs.c
+1
drivers/staging/r8188eu/os_dep/os_intfs.c
···
18
18
MODULE_DESCRIPTION("Realtek Wireless Lan Driver");
19
19
MODULE_AUTHOR("Realtek Semiconductor Corp.");
20
20
MODULE_VERSION(DRIVERVERSION);
21
+
MODULE_FIRMWARE("rtlwifi/rtl8188eufw.bin");
21
22
22
23
#define CONFIG_BR_EXT_BRNAME "br0"
23
24
#define RTW_NOTCH_FILTER 0 /* 0:Disable, 1:Enable, */
+1
drivers/staging/r8188eu/os_dep/usb_intf.c
+1
drivers/staging/r8188eu/os_dep/usb_intf.c
···
28
28
/*=== Realtek demoboard ===*/
29
29
{USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8179)}, /* 8188EUS */
30
30
{USB_DEVICE(USB_VENDER_ID_REALTEK, 0x0179)}, /* 8188ETV */
31
+
{USB_DEVICE(USB_VENDER_ID_REALTEK, 0xffef)}, /* Rosewill USB-N150 Nano */
31
32
/*=== Customer ID ===*/
32
33
/****** 8188EUS ********/
33
34
{USB_DEVICE(0x07B8, 0x8179)}, /* Abocom - Abocom */
-36
drivers/staging/rtl8712/rtl8712_cmd.c
-36
drivers/staging/rtl8712/rtl8712_cmd.c
···
117
117
kfree(pdrvcmd->pbuf);
118
118
}
119
119
120
-
static u8 read_macreg_hdl(struct _adapter *padapter, u8 *pbuf)
121
-
{
122
-
void (*pcmd_callback)(struct _adapter *dev, struct cmd_obj *pcmd);
123
-
struct cmd_obj *pcmd = (struct cmd_obj *)pbuf;
124
-
125
-
/* invoke cmd->callback function */
126
-
pcmd_callback = cmd_callback[pcmd->cmdcode].callback;
127
-
if (!pcmd_callback)
128
-
r8712_free_cmd_obj(pcmd);
129
-
else
130
-
pcmd_callback(padapter, pcmd);
131
-
return H2C_SUCCESS;
132
-
}
133
-
134
-
static u8 write_macreg_hdl(struct _adapter *padapter, u8 *pbuf)
135
-
{
136
-
void (*pcmd_callback)(struct _adapter *dev, struct cmd_obj *pcmd);
137
-
struct cmd_obj *pcmd = (struct cmd_obj *)pbuf;
138
-
139
-
/* invoke cmd->callback function */
140
-
pcmd_callback = cmd_callback[pcmd->cmdcode].callback;
141
-
if (!pcmd_callback)
142
-
r8712_free_cmd_obj(pcmd);
143
-
else
144
-
pcmd_callback(padapter, pcmd);
145
-
return H2C_SUCCESS;
146
-
}
147
-
148
120
static u8 read_bbreg_hdl(struct _adapter *padapter, u8 *pbuf)
149
121
{
150
122
struct cmd_obj *pcmd = (struct cmd_obj *)pbuf;
···
185
213
pcmd_r = NULL;
186
214
187
215
switch (pcmd->cmdcode) {
188
-
case GEN_CMD_CODE(_Read_MACREG):
189
-
read_macreg_hdl(padapter, (u8 *)pcmd);
190
-
pcmd_r = pcmd;
191
-
break;
192
-
case GEN_CMD_CODE(_Write_MACREG):
193
-
write_macreg_hdl(padapter, (u8 *)pcmd);
194
-
pcmd_r = pcmd;
195
-
break;
196
216
case GEN_CMD_CODE(_Read_BBREG):
197
217
read_bbreg_hdl(padapter, (u8 *)pcmd);
198
218
break;