From f7369d7dabe4363e886d53a3e515a082bfc269b0 Mon Sep 17 00:00:00 2001 From: Kulikov Vasiliy Date: Sat, 10 Jul 2010 16:28:57 +0400 Subject: [PATCH] --- yaml --- r: 203536 b: refs/heads/master c: b85aeb51805265b9f826857e5c5d9c0cd70dda55 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/adm8211.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 873e391899e3..e13a9da7ac6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c92831d99827971cf2854cfa7f884213099428f +refs/heads/master: b85aeb51805265b9f826857e5c5d9c0cd70dda55 diff --git a/trunk/drivers/net/wireless/adm8211.c b/trunk/drivers/net/wireless/adm8211.c index 880ad9d170c2..bde2fa8bb639 100644 --- a/trunk/drivers/net/wireless/adm8211.c +++ b/trunk/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 +