staging: r8188eu: correct error logic of rtl8188eu_init_recv_priv()
authorMichael Straube <straube.linux@gmail.com>
Sun, 5 Feb 2023 08:05:58 +0000 (09:05 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Feb 2023 09:48:01 +0000 (10:48 +0100)
Convert the function rtl8188eu_init_recv_priv() away from returning
_FAIL and _SUCCESS, which uses inverted error logic. Return 0 for
success and negative values for failure instead.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20230205080559.8319-2-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_recv.c

index 631c500dda4279ffb19f80d95490e4e28be256fb..70d43c10e53d87ff593ac3d37725851578b835a5 100644 (file)
@@ -38,7 +38,7 @@ void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv)
 static int rtl8188eu_init_recv_priv(struct adapter *padapter)
 {
        struct recv_priv *precvpriv = &padapter->recvpriv;
-       int i, res = _SUCCESS;
+       int i, err = 0;
        struct recv_buf *precvbuf;
 
        tasklet_init(&precvpriv->recv_tasklet,
@@ -50,10 +50,8 @@ static int rtl8188eu_init_recv_priv(struct adapter *padapter)
 
        precvpriv->pallocated_recv_buf = kzalloc(NR_RECVBUFF * sizeof(struct recv_buf) + 4,
                                                 GFP_KERNEL);
-       if (!precvpriv->pallocated_recv_buf) {
-               res = _FAIL;
-               goto exit;
-       }
+       if (!precvpriv->pallocated_recv_buf)
+               return -ENOMEM;
 
        precvpriv->precv_buf = (u8 *)ALIGN((size_t)(precvpriv->pallocated_recv_buf), 4);
 
@@ -64,7 +62,7 @@ static int rtl8188eu_init_recv_priv(struct adapter *padapter)
                precvbuf->reuse = false;
                precvbuf->purb = usb_alloc_urb(0, GFP_KERNEL);
                if (!precvbuf->purb) {
-                       res = _FAIL;
+                       err = -ENOMEM;
                        break;
                }
                precvbuf->adapter = padapter;
@@ -94,8 +92,8 @@ static int rtl8188eu_init_recv_priv(struct adapter *padapter)
                        pskb = NULL;
                }
        }
-exit:
-       return res;
+
+       return err;
 }
 
 int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
@@ -141,7 +139,8 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
        }
        precvpriv->rx_pending_cnt = 1;
 
-       res = rtl8188eu_init_recv_priv(padapter);
+       if (rtl8188eu_init_recv_priv(padapter))
+               res = _FAIL;
 
        timer_setup(&precvpriv->signal_stat_timer, rtw_signal_stat_timer_hdl, 0);
        precvpriv->signal_stat_sampling_interval = 1000; /* ms */