From a4898e78c368fbb3a22d8a080a2befe28063b5d8 Mon Sep 17 00:00:00 2001 From: Nishka Dasgupta Date: Wed, 26 Jun 2019 11:39:39 +0530 Subject: [PATCH] staging: rtl8712: r8712_xmit_resource_alloc(): Change return values Change call site of function r8712_xmit_resource_alloc to add a check for its return value. Change return values of r8712_xmit_resource_alloc from _SUCCESS/_FAIL to 0/-ENOMEM. Signed-off-by: Nishka Dasgupta Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8712/rtl871x_xmit.c | 3 ++- drivers/staging/rtl8712/xmit_linux.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c index 5d63d2721eb6..0a26d71e5340 100644 --- a/drivers/staging/rtl8712/rtl871x_xmit.c +++ b/drivers/staging/rtl8712/rtl871x_xmit.c @@ -133,7 +133,8 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv, pxmitbuf->pbuf = pxmitbuf->pallocated_buf + XMITBUF_ALIGN_SZ - ((addr_t) (pxmitbuf->pallocated_buf) & (XMITBUF_ALIGN_SZ - 1)); - r8712_xmit_resource_alloc(padapter, pxmitbuf); + if (r8712_xmit_resource_alloc(padapter, pxmitbuf)) + return _FAIL; list_add_tail(&pxmitbuf->list, &(pxmitpriv->free_xmitbuf_queue.queue)); pxmitbuf++; diff --git a/drivers/staging/rtl8712/xmit_linux.c b/drivers/staging/rtl8712/xmit_linux.c index dc03f0d0c85d..01d713d027b0 100644 --- a/drivers/staging/rtl8712/xmit_linux.c +++ b/drivers/staging/rtl8712/xmit_linux.c @@ -120,11 +120,11 @@ int r8712_xmit_resource_alloc(struct _adapter *padapter, pxmitbuf->pxmit_urb[i] = usb_alloc_urb(0, GFP_KERNEL); if (!pxmitbuf->pxmit_urb[i]) { netdev_err(padapter->pnetdev, "pxmitbuf->pxmit_urb[i] == NULL\n"); - return _FAIL; + return -ENOMEM; } kmemleak_not_leak(pxmitbuf->pxmit_urb[i]); } - return _SUCCESS; + return 0; } void r8712_xmit_resource_free(struct _adapter *padapter,