rt2x00: Don't free register information on suspend

After suspend & resume the rt2x00 devices won't wakeup
anymore due to a broken register information setup.
The most important problem is the release of the EEPROM
buffer which is completely cleared and never read again
after the suspend.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 1 insertions, 17 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index 43fa0f849003..9730b4f8fd26 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -369,8 +369,6 @@ int rt2x00pci_suspend(struct pci_dev *pci_dev, pm_message_t state)
         if (retval)
                 return retval;
 
-        rt2x00pci_free_reg(rt2x00dev);
-
         pci_save_state(pci_dev);
         pci_disable_device(pci_dev);
         return pci_set_power_state(pci_dev, pci_choose_state(pci_dev, state));
@@ -381,7 +379,6 @@ int rt2x00pci_resume(struct pci_dev *pci_dev)
 {
         struct ieee80211_hw *hw = pci_get_drvdata(pci_dev);
         struct rt2x00_dev *rt2x00dev = hw->priv;
-        int retval;
 
         if (pci_set_power_state(pci_dev, PCI_D0) ||
             pci_enable_device(pci_dev) ||
@@ -390,20 +387,7 @@ int rt2x00pci_resume(struct pci_dev *pci_dev)
                 return -EIO;
         }
 
-        retval = rt2x00pci_alloc_reg(rt2x00dev);
-        if (retval)
-                return retval;
-
-        retval = rt2x00lib_resume(rt2x00dev);
-        if (retval)
-                goto exit_free_reg;
-
-        return 0;
-
-exit_free_reg:
-        rt2x00pci_free_reg(rt2x00dev);
-
-        return retval;
+        return rt2x00lib_resume(rt2x00dev);
 }
 EXPORT_SYMBOL_GPL(rt2x00pci_resume);
 #endif /* CONFIG_PM */