microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

staging: rtl8712: Change return values of r8712_getrfreg_cmd() 

Change return values of r8712_getrfreg_cmd from _SUCCESS/_FAIL to
0/-ENOMEM respectively. Modify call site accordingly.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Nishka Dasgupta 2019-06-26 11:39:33 +05:30 коммит произвёл Greg Kroah-Hartman
Родитель d19b75b051
Коммит 9839208ea9
3 изменённых файлов: 6 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
drivers/staging/rtl8712/rtl871x_cmd.c
Просмотреть файл

@ -280,7 +280,7 @@ int r8712_setrfreg_cmd(struct _adapter *padapter, u8 offset, u32 val)
return 0; return 0;
} }
u8 r8712_getrfreg_cmd(struct _adapter *padapter, u8 offset, u8 *pval) int r8712_getrfreg_cmd(struct _adapter *padapter, u8 offset, u8 *pval)
{ {
struct cmd_obj *ph2c; struct cmd_obj *ph2c;
struct readRF_parm *prdrfparm; struct readRF_parm *prdrfparm;
@ -288,11 +288,11 @@ u8 r8712_getrfreg_cmd(struct _adapter *padapter, u8 offset, u8 *pval)
ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC); ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC);
if (!ph2c) if (!ph2c)
return _FAIL; return -ENOMEM;
prdrfparm = kmalloc(sizeof(*prdrfparm), GFP_ATOMIC); prdrfparm = kmalloc(sizeof(*prdrfparm), GFP_ATOMIC);
if (!prdrfparm) { if (!prdrfparm) {
kfree(ph2c); kfree(ph2c);
return _FAIL; return -ENOMEM;
} }
INIT_LIST_HEAD(&ph2c->list); INIT_LIST_HEAD(&ph2c->list);
ph2c->cmdcode = GEN_CMD_CODE(_GetRFReg); ph2c->cmdcode = GEN_CMD_CODE(_GetRFReg);
@ -302,7 +302,7 @@ u8 r8712_getrfreg_cmd(struct _adapter *padapter, u8 offset, u8 *pval)
ph2c->rspsz = sizeof(struct readRF_rsp); ph2c->rspsz = sizeof(struct readRF_rsp);
prdrfparm->offset = offset; prdrfparm->offset = offset;
r8712_enqueue_cmd(pcmdpriv, ph2c); r8712_enqueue_cmd(pcmdpriv, ph2c);
return _SUCCESS; return 0;
} }
void r8712_getbbrfreg_cmdrsp_callback(struct _adapter *padapter, void r8712_getbbrfreg_cmdrsp_callback(struct _adapter *padapter,

2
drivers/staging/rtl8712/rtl871x_cmd.h
Просмотреть файл

@ -720,7 +720,7 @@ void r8712_setopmode_cmd(struct _adapter *padapter,
enum NDIS_802_11_NETWORK_INFRASTRUCTURE networktype); enum NDIS_802_11_NETWORK_INFRASTRUCTURE networktype);
int r8712_setdatarate_cmd(struct _adapter *padapter, u8 *rateset); int r8712_setdatarate_cmd(struct _adapter *padapter, u8 *rateset);
void r8712_set_chplan_cmd(struct _adapter *padapter, int chplan); void r8712_set_chplan_cmd(struct _adapter *padapter, int chplan);
u8 r8712_getrfreg_cmd(struct _adapter *padapter, u8 offset, u8 *pval); int r8712_getrfreg_cmd(struct _adapter *padapter, u8 offset, u8 *pval);
int r8712_setrfreg_cmd(struct _adapter *padapter, u8 offset, u32 val); int r8712_setrfreg_cmd(struct _adapter *padapter, u8 offset, u32 val);
void r8712_addbareq_cmd(struct _adapter *padapter, u8 tid); void r8712_addbareq_cmd(struct _adapter *padapter, u8 tid);
void r8712_wdg_wk_cmd(struct _adapter *padapter); void r8712_wdg_wk_cmd(struct _adapter *padapter);

2
drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
Просмотреть файл

@ -467,7 +467,7 @@ uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *poid_par_priv)
* RegDataWidth = *((unsigned long *)InformationBuffer+1); * RegDataWidth = *((unsigned long *)InformationBuffer+1);
* RegDataValue = *((unsigned long *)InformationBuffer+2); * RegDataValue = *((unsigned long *)InformationBuffer+2);
*/ */
if (!r8712_getrfreg_cmd(Adapter, if (r8712_getrfreg_cmd(Adapter,
*(unsigned char *)poid_par_priv->information_buf, *(unsigned char *)poid_par_priv->information_buf,
(unsigned char *)&Adapter->mppriv.workparam.io_value (unsigned char *)&Adapter->mppriv.workparam.io_value
)) ))