| Message ID | 1470949988-25705-4-git-send-email-wsa-dev@sang-engineering.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 08/11/2016 04:13 PM, Wolfram Sang wrote: > kmalloc will print enough information in case of failure. > > Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com> > --- > drivers/net/wireless/realtek/rtlwifi/usb.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) Acked-by: Larry Finger <Larry.Finger@lwfinger.net> > > diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.c b/drivers/net/wireless/realtek/rtlwifi/usb.c > index 41617b7b082260..32aa5c1d070a07 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/usb.c > +++ b/drivers/net/wireless/realtek/rtlwifi/usb.c > @@ -739,11 +739,8 @@ static int _rtl_usb_receive(struct ieee80211_hw *hw) > for (i = 0; i < rtlusb->rx_urb_num; i++) { > err = -ENOMEM; > urb = usb_alloc_urb(0, GFP_KERNEL); > - if (!urb) { > - RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG, > - "Failed to alloc URB!!\n"); > + if (!urb) > goto err_out; > - } > > err = _rtl_prep_rx_urb(hw, rtlusb, urb, GFP_KERNEL); > if (err < 0) { > @@ -907,15 +904,12 @@ static void _rtl_tx_complete(struct urb *urb) > static struct urb *_rtl_usb_tx_urb_setup(struct ieee80211_hw *hw, > struct sk_buff *skb, u32 ep_num) > { > - struct rtl_priv *rtlpriv = rtl_priv(hw); > struct rtl_usb *rtlusb = rtl_usbdev(rtl_usbpriv(hw)); > struct urb *_urb; > > WARN_ON(NULL == skb); > _urb = usb_alloc_urb(0, GFP_ATOMIC); > if (!_urb) { > - RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG, > - "Can't allocate URB for bulk out!\n"); > kfree_skb(skb); > return NULL; > } >
diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.c b/drivers/net/wireless/realtek/rtlwifi/usb.c index 41617b7b082260..32aa5c1d070a07 100644 --- a/drivers/net/wireless/realtek/rtlwifi/usb.c +++ b/drivers/net/wireless/realtek/rtlwifi/usb.c @@ -739,11 +739,8 @@ static int _rtl_usb_receive(struct ieee80211_hw *hw) for (i = 0; i < rtlusb->rx_urb_num; i++) { err = -ENOMEM; urb = usb_alloc_urb(0, GFP_KERNEL); - if (!urb) { - RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG, - "Failed to alloc URB!!\n"); + if (!urb) goto err_out; - } err = _rtl_prep_rx_urb(hw, rtlusb, urb, GFP_KERNEL); if (err < 0) { @@ -907,15 +904,12 @@ static void _rtl_tx_complete(struct urb *urb) static struct urb *_rtl_usb_tx_urb_setup(struct ieee80211_hw *hw, struct sk_buff *skb, u32 ep_num) { - struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_usb *rtlusb = rtl_usbdev(rtl_usbpriv(hw)); struct urb *_urb; WARN_ON(NULL == skb); _urb = usb_alloc_urb(0, GFP_ATOMIC); if (!_urb) { - RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG, - "Can't allocate URB for bulk out!\n"); kfree_skb(skb); return NULL; }
kmalloc will print enough information in case of failure. Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com> --- drivers/net/wireless/realtek/rtlwifi/usb.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)