Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-beck.git] / drivers / net / wireless / rt2x00 / rt61pci.c

diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 1cb056be44890b6c1f869a788a533d670db92990..468a31c8c113ff9fd0ae75a7556547cfbcf57a84 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2379,10 +2379,8 @@ static int rt61pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
         */
        if (skb_headroom(skb) < intf->beacon->queue->desc_size) {
                if (pskb_expand_head(skb, intf->beacon->queue->desc_size,
-                                    0, GFP_ATOMIC)) {
-                       dev_kfree_skb(skb);
+                                    0, GFP_ATOMIC))
                        return -ENOMEM;
-               }
        }
 
        /*