diff options
Diffstat (limited to 'drivers/staging/rtl8712/rtl8712_cmd.c')
-rw-r--r-- | drivers/staging/rtl8712/rtl8712_cmd.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/staging/rtl8712/rtl8712_cmd.c b/drivers/staging/rtl8712/rtl8712_cmd.c index 1920d02f7c9f..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; } @@ -317,7 +309,7 @@ int r8712_cmd_thread(void *context) while (1) { if (wait_for_completion_interruptible(cmd_queue_comp)) break; - if (padapter->bDriverStopped || padapter->bSurpriseRemoved) + if (padapter->driver_stopped || padapter->surprise_removed) break; if (r8712_register_cmd_alive(padapter) != _SUCCESS) continue; @@ -368,8 +360,8 @@ _next: pcmdbuf += 2; /* 8 bytes alignment */ memcpy((u8 *)pcmdbuf, pcmd->parmbuf, pcmd->cmdsz); while (check_cmd_fifo(padapter, wr_sz) == _FAIL) { - if (padapter->bDriverStopped || - padapter->bSurpriseRemoved) + if (padapter->driver_stopped || + padapter->surprise_removed) break; msleep(100); continue; |