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

staging: r8188eu: improve timeout handling in rtl8188e_firmware_download 



Use the standard kernel functions to define and check the timeout in
rtl8188e_firmware_download.

Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220409163212.241122-5-martin@kaiser.cx


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

drivers/staging/r8188eu/core/rtw_fw.c

+3 −3
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ int rtl8188e_firmware_download(struct adapter *padapter) 
{

	int ret = _SUCCESS;

	u8 write_fw_retry = 0;

	u32 fwdl_start_time;

	unsigned long fwdl_timeout;

	struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);

	struct device *device = dvobj_to_dev(dvobj);

	struct rt_firmware_hdr *fwhdr = NULL;
@@ -290,7 +290,7 @@ int rtl8188e_firmware_download(struct adapter *padapter) 
	}



	fw_download_enable(padapter, true);

	fwdl_start_time = jiffies;

	fwdl_timeout = jiffies + msecs_to_jiffies(500);

	while (1) {

		/* reset the FWDL chksum */

		rtw_write8(padapter, REG_MCUFWDL, rtw_read8(padapter, REG_MCUFWDL) | FWDL_CHKSUM_RPT);
@@ -298,7 +298,7 @@ int rtl8188e_firmware_download(struct adapter *padapter) 
		ret = write_fw(padapter, fw_data, fw_size);



		if (ret == _SUCCESS ||

		    (rtw_get_passing_time_ms(fwdl_start_time) > 500 && write_fw_retry++ >= 3))

		    (time_after(jiffies, fwdl_timeout) && write_fw_retry++ >= 3))

			break;

	}

	fw_download_enable(padapter, false);