Commit 9839208e authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Greg Kroah-Hartman
Browse files

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: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d19b75b0

drivers/staging/rtl8712/rtl871x_cmd.c

+4 −4
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ int r8712_setrfreg_cmd(struct _adapter *padapter, u8 offset, u32 val) 
	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 readRF_parm *prdrfparm;
@@ -288,11 +288,11 @@ u8 r8712_getrfreg_cmd(struct _adapter *padapter, u8 offset, u8 *pval) 


	ph2c = kmalloc(sizeof(*ph2c), GFP_ATOMIC);

	if (!ph2c)

		return _FAIL;

		return -ENOMEM;

	prdrfparm = kmalloc(sizeof(*prdrfparm), GFP_ATOMIC);

	if (!prdrfparm) {

		kfree(ph2c);

		return _FAIL;

		return -ENOMEM;

	}

	INIT_LIST_HEAD(&ph2c->list);

	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);

	prdrfparm->offset = offset;

	r8712_enqueue_cmd(pcmdpriv, ph2c);

	return _SUCCESS;

	return 0;

}



void r8712_getbbrfreg_cmdrsp_callback(struct _adapter *padapter,

drivers/staging/rtl8712/rtl871x_cmd.h

+1 −1
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ void r8712_setopmode_cmd(struct _adapter *padapter, 
		 enum NDIS_802_11_NETWORK_INFRASTRUCTURE networktype);

int r8712_setdatarate_cmd(struct _adapter *padapter, u8 *rateset);

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);

void r8712_addbareq_cmd(struct _adapter *padapter, u8 tid);

void r8712_wdg_wk_cmd(struct _adapter *padapter);

drivers/staging/rtl8712/rtl871x_ioctl_rtl.c

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ uint oid_rt_pro_rf_read_registry_hdl(struct oid_par_priv *poid_par_priv) 
		 * RegDataWidth = *((unsigned long *)InformationBuffer+1);

		 * RegDataValue =  *((unsigned long *)InformationBuffer+2);

		 */

			if (!r8712_getrfreg_cmd(Adapter,

			if (r8712_getrfreg_cmd(Adapter,

			    *(unsigned char *)poid_par_priv->information_buf,

			    (unsigned char *)&Adapter->mppriv.workparam.io_value

			    ))

CRA Git | Maintained and supported by SUSTech CRA and CCSE