Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

[~andy/linux] / drivers / staging / rtl8192e / r8192_pm.c

diff --git a/drivers/staging/rtl8192e/r8192_pm.c b/drivers/staging/rtl8192e/r8192_pm.c
index 5679c8ba370d2ee6923e60ce3da87a9ccafc77cc..7bcc4a35099170e0fc50cd4f5d0ca050cdfd94ef 100644 (file)
--- a/drivers/staging/rtl8192e/r8192_pm.c
+++ b/drivers/staging/rtl8192e/r8192_pm.c
@@ -36,7 +36,7 @@ int rtl8192E_suspend (struct pci_dev *pdev, pm_message_t state)
 
        // Call MgntActSet_RF_State instead to prevent RF config race condition.
        if(!priv->ieee80211->bSupportRemoteWakeUp) {
-               MgntActSet_RF_State(dev, eRfOff, RF_CHANGE_BY_INIT);
+               MgntActSet_RF_State(priv, eRfOff, RF_CHANGE_BY_INIT);
                // 2006.11.30. System reset bit
                ulRegRead = read_nic_dword(priv, CPU_GEN);
                ulRegRead|=CPU_GEN_SYSTEM_RESET;
@@ -73,7 +73,7 @@ int rtl8192E_resume (struct pci_dev *pdev)
        int err;
        u32 val;
 
-        RT_TRACE(COMP_POWER, "================>r8192E resume call.");
+        RT_TRACE(COMP_POWER, "================>r8192E resume call.\n");
 
        pci_set_power_state(pdev, PCI_D0);