Commit 8985814b authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: convert rtw_xmit_resource_alloc() to common error logic 



Convert the function rtw_xmit_resource_alloc() away from returning
_FAIL or _SUCCESS which uses inverted error logic. Use the common
error logic instead. Return 0 for success and negative values for
failure.

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20221111083733.3144-3-straube.linux@gmail.com


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

drivers/staging/r8188eu/core/rtw_xmit.c

+8 −9
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static int rtw_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *px 
{

	pxmitbuf->pallocated_buf = kzalloc(alloc_sz, GFP_KERNEL);

	if (!pxmitbuf->pallocated_buf)

		return _FAIL;

		return -ENOMEM;



	pxmitbuf->pbuf = (u8 *)ALIGN((size_t)(pxmitbuf->pallocated_buf), XMITBUF_ALIGN_SZ);

	pxmitbuf->dma_transfer_addr = 0;
@@ -46,10 +46,10 @@ static int rtw_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *px 
	pxmitbuf->pxmit_urb = usb_alloc_urb(0, GFP_KERNEL);

	if (!pxmitbuf->pxmit_urb) {

		kfree(pxmitbuf->pallocated_buf);

		return _FAIL;

		return -ENOMEM;

	}



	return _SUCCESS;

	return 0;

}



static void rtw_xmit_resource_free(struct adapter *padapter, struct xmit_buf *pxmitbuf,
@@ -151,13 +151,13 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) 
		pxmitbuf->ext_tag = false;



		/* Tx buf allocation may fail sometimes, so sleep and retry. */

		res = rtw_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ));

		if (res == _FAIL) {

		if (rtw_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ))) {

			msleep(10);

			res = rtw_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ));

			if (res == _FAIL)

			if (rtw_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ))) {

				res = _FAIL;

				goto free_xmitbuf;

			}

		}



		pxmitbuf->flags = XMIT_VO_QUEUE;
@@ -188,8 +188,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) 
		pxmitbuf->padapter = padapter;

		pxmitbuf->ext_tag = true;



		res = rtw_xmit_resource_alloc(padapter, pxmitbuf, max_xmit_extbuf_size + XMITBUF_ALIGN_SZ);

		if (res == _FAIL) {

		if (rtw_xmit_resource_alloc(padapter, pxmitbuf, max_xmit_extbuf_size + XMITBUF_ALIGN_SZ)) {

			res = _FAIL;

			goto free_xmit_extbuf;

		}