diff options
| -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 1920d02f7c9f..8c36acedf507 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) | |||
| 147 | 147 | ||
| 148 | static u8 read_bbreg_hdl(struct _adapter *padapter, u8 *pbuf) | 148 | static u8 read_bbreg_hdl(struct _adapter *padapter, u8 *pbuf) |
| 149 | { | 149 | { |
| 150 | u32 val; | ||
| 151 | void (*pcmd_callback)(struct _adapter *dev, struct cmd_obj *pcmd); | ||
| 152 | struct cmd_obj *pcmd = (struct cmd_obj *)pbuf; | 150 | struct cmd_obj *pcmd = (struct cmd_obj *)pbuf; |
| 153 | 151 | ||
| 154 | if (pcmd->rsp && pcmd->rspsz > 0) | 152 | r8712_free_cmd_obj(pcmd); |
| 155 | memcpy(pcmd->rsp, (u8 *)&val, pcmd->rspsz); | ||
| 156 | pcmd_callback = cmd_callback[pcmd->cmdcode].callback; | ||
| 157 | if (!pcmd_callback) | ||
| 158 | r8712_free_cmd_obj(pcmd); | ||
| 159 | else | ||
| 160 | pcmd_callback(padapter, pcmd); | ||
| 161 | return H2C_SUCCESS; | 153 | return H2C_SUCCESS; |
| 162 | } | 154 | } |
| 163 | 155 | ||
diff --git a/drivers/staging/rtl8712/rtl8712_cmd.h b/drivers/staging/rtl8712/rtl8712_cmd.h index 92fb77666d44..1ef86b8c592f 100644 --- a/drivers/staging/rtl8712/rtl8712_cmd.h +++ b/drivers/staging/rtl8712/rtl8712_cmd.h | |||
| @@ -140,7 +140,7 @@ enum rtl8712_h2c_cmd { | |||
| 140 | static struct _cmd_callback cmd_callback[] = { | 140 | static struct _cmd_callback cmd_callback[] = { |
| 141 | {GEN_CMD_CODE(_Read_MACREG), NULL}, /*0*/ | 141 | {GEN_CMD_CODE(_Read_MACREG), NULL}, /*0*/ |
| 142 | {GEN_CMD_CODE(_Write_MACREG), NULL}, | 142 | {GEN_CMD_CODE(_Write_MACREG), NULL}, |
| 143 | {GEN_CMD_CODE(_Read_BBREG), &r8712_getbbrfreg_cmdrsp_callback}, | 143 | {GEN_CMD_CODE(_Read_BBREG), NULL}, |
| 144 | {GEN_CMD_CODE(_Write_BBREG), NULL}, | 144 | {GEN_CMD_CODE(_Write_BBREG), NULL}, |
| 145 | {GEN_CMD_CODE(_Read_RFREG), &r8712_getbbrfreg_cmdrsp_callback}, | 145 | {GEN_CMD_CODE(_Read_RFREG), &r8712_getbbrfreg_cmdrsp_callback}, |
| 146 | {GEN_CMD_CODE(_Write_RFREG), NULL}, /*5*/ | 146 | {GEN_CMD_CODE(_Write_RFREG), NULL}, /*5*/ |
