Merge remote-tracking branch 'keys/keys-next'

[deliverable/linux.git] / drivers / net / wireless / realtek / rtlwifi / usb.c

diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.c b/drivers/net/wireless/realtek/rtlwifi/usb.c
index 41617b7b0822609a78538838dfd664d046948be4..32aa5c1d070a07b429e97c03c9ff6f14c48cb91e 100644 (file)
--- 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;
        }