Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	drivers/net/wireless/wl12xx/wl1271_cmd.h

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index 880ad9d170c2..bde2fa8bb639 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -1903,7 +1903,7 @@ static int __devinit adm8211_probe(struct pci_dev *pdev,
         if (err) {
                 printk(KERN_ERR "%s (adm8211): Cannot register device\n",
                        pci_name(pdev));
-                goto err_free_desc;
+                goto err_free_eeprom;
         }
 
         printk(KERN_INFO "%s: hwaddr %pM, Rev 0x%02x\n",
@@ -1912,6 +1912,9 @@ static int __devinit adm8211_probe(struct pci_dev *pdev,
 
         return 0;
 
+ err_free_eeprom:
+        kfree(priv->eeprom);
+
  err_free_desc:
         pci_free_consistent(pdev,
                             sizeof(struct adm8211_desc) * priv->rx_ring_size +