rtlwifi: fix memory leak for USB device

[pandora-kernel.git] / drivers / net / wireless / rtlwifi / usb.c

diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
index c04ee92..968137a 100644 (file)
--- a/drivers/net/wireless/rtlwifi/usb.c
+++ b/drivers/net/wireless/rtlwifi/usb.c
@@ -117,7 +117,7 @@ static int _usbctrl_vendorreq_sync_read(struct usb_device *udev, u8 request,
        reqtype =  REALTEK_USB_VENQT_READ;
 
        status = usb_control_msg(udev, pipe, request, reqtype, value, index,
-                                pdata, len, 0); /* max. timeout */
+                                pdata, len, 1000);
 
        if (status < 0)
                pr_err("reg 0x%x, usbctrl_vendorreq TimeOut! status:0x%x value=0x%x\n",
@@ -500,6 +500,8 @@ static void _rtl_usb_rx_process_noagg(struct ieee80211_hw *hw,
                } else {
                        dev_kfree_skb_any(skb);
                }
+       } else {
+               dev_kfree_skb_any(skb);
        }
 }
 
@@ -812,6 +814,7 @@ static void _rtl_usb_transmit(struct ieee80211_hw *hw, struct sk_buff *skb,
        if (unlikely(!_urb)) {
                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                         ("Can't allocate urb. Drop skb!\n"));
+               kfree_skb(skb);
                return;
        }
        urb_list = &rtlusb->tx_pending[ep_num];