diff options
| author | Greg Kroah-Hartman | 2019-04-01 07:49:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-04-01 07:49:24 +0200 |
| commit | b397f82585c3101dcf92642dd359891e66d00c55 (patch) | |
| tree | 5f7f711b8582d723e1f4c0bb658b7dcaba656ad4 /drivers/staging/rtl8712 | |
| parent | staging: rtlwifi: phydm: Remove parentheses (diff) | |
| parent | Linux 5.1-rc3 (diff) | |
| download | kernel-qcow2-linux-b397f82585c3101dcf92642dd359891e66d00c55.tar.gz kernel-qcow2-linux-b397f82585c3101dcf92642dd359891e66d00c55.tar.xz kernel-qcow2-linux-b397f82585c3101dcf92642dd359891e66d00c55.zip | |
Merge 5.1-rc3 into staging-next
We want those fixes and this resolves an erofs merge conflict.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8712')
| -rw-r--r-- | drivers/staging/rtl8712/rtl8712_cmd.c | 10 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/rtl8712_cmd.h | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/drivers/staging/rtl8712/rtl8712_cmd.c b/drivers/staging/rtl8712/rtl8712_cmd.c index 1ffd984c25a4..6a72a4ad176a 100644 --- a/drivers/staging/rtl8712/rtl8712_cmd.c +++ b/drivers/staging/rtl8712/rtl8712_cmd.c @@ -147,17 +147,9 @@ static u8 write_macreg_hdl(struct _adapter *padapter, u8 *pbuf) static u8 read_bbreg_hdl(struct _adapter *padapter, u8 *pbuf) { - u32 val; - void (*pcmd_callback)(struct _adapter *dev, struct cmd_obj *pcmd); struct cmd_obj *pcmd = (struct cmd_obj *)pbuf; - if (pcmd->rsp && pcmd->rspsz > 0) - memcpy(pcmd->rsp, (u8 *)&val, pcmd->rspsz); - pcmd_callback = cmd_callback[pcmd->cmdcode].callback; - if (!pcmd_callback) - r8712_free_cmd_obj(pcmd); - else - pcmd_callback(padapter, pcmd); + r8712_free_cmd_obj(pcmd); return H2C_SUCCESS; } diff --git a/drivers/staging/rtl8712/rtl8712_cmd.h b/drivers/staging/rtl8712/rtl8712_cmd.h index 366b90af64fd..a34d0dd023f3 100644 --- a/drivers/staging/rtl8712/rtl8712_cmd.h +++ b/drivers/staging/rtl8712/rtl8712_cmd.h @@ -139,7 +139,7 @@ enum rtl8712_h2c_cmd { static struct _cmd_callback cmd_callback[] = { {GEN_CMD_CODE(_Read_MACREG), NULL}, /*0*/ {GEN_CMD_CODE(_Write_MACREG), NULL}, - {GEN_CMD_CODE(_Read_BBREG), &r8712_getbbrfreg_cmdrsp_callback}, + {GEN_CMD_CODE(_Read_BBREG), NULL}, {GEN_CMD_CODE(_Write_BBREG), NULL}, {GEN_CMD_CODE(_Read_RFREG), &r8712_getbbrfreg_cmdrsp_callback}, {GEN_CMD_CODE(_Write_RFREG), NULL}, /*5*/ |