Commit adf84160 authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: process HalUsbSetQueuePipeMapping8188EUsb's return value 



At the moment, HalUsbSetQueuePipeMapping8188EUsb returns an error status
to rtl8188eu_interface_configure, where this status is discarded.

Pass the error status from rtl8188eu_interface_configure to
rtw_usb_if1_init and handle it there.

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220806195540.777390-3-martin@kaiser.cx


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a3cba3f0

drivers/staging/r8188eu/hal/usb_halinit.c

+2 −2
Original line number Diff line number Diff line
@@ -42,11 +42,11 @@ static int HalUsbSetQueuePipeMapping8188EUsb(struct adapter *adapt, u8 NumOutPip 
	return Hal_MappingOutPipe(adapt, NumOutPipe);

}



void rtl8188eu_interface_configure(struct adapter *adapt)

int rtl8188eu_interface_configure(struct adapter *adapt)

{

	struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(adapt);



	HalUsbSetQueuePipeMapping8188EUsb(adapt, pdvobjpriv->RtNumOutPipes);

	return HalUsbSetQueuePipeMapping8188EUsb(adapt, pdvobjpriv->RtNumOutPipes);

}



u32 rtl8188eu_InitPowerOn(struct adapter *adapt)

drivers/staging/r8188eu/include/hal_intf.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


typedef s32 (*c2h_id_filter)(u8 id);



void rtl8188eu_interface_configure(struct adapter *adapt);

int rtl8188eu_interface_configure(struct adapter *adapt);

int ReadAdapterInfo8188EU(struct adapter *Adapter);

void rtl8188eu_init_default_value(struct adapter *adapt);

void rtl8188e_SetHalODMVar(struct adapter *Adapter, void *pValue1, bool bSet);

drivers/staging/r8188eu/os_dep/usb_intf.c

+3 −1
Original line number Diff line number Diff line
@@ -330,7 +330,9 @@ static int rtw_usb_if1_init(struct dvobj_priv *dvobj, struct usb_interface *pusb 
	rtl8188e_read_chip_version(padapter);



	/* step usb endpoint mapping */

	rtl8188eu_interface_configure(padapter);

	ret = rtl8188eu_interface_configure(padapter);

	if (ret)

		goto handle_dualmac;



	/* step read efuse/eeprom data and get mac_addr */

	ret = ReadAdapterInfo8188EU(padapter);