mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 13:55:32 +00:00
Code Issues Releases Wiki Activity

Staging: rtl8192e: Use the standard config option for PM functions

Browse source 
Use the standard config option CONFIG_PM to enable rtl8192e PM
functions. Tested on Samsung N140 and it works fine. Without enabling
the PM functions, the box always fails to resume.

Signed-off-by: Yong Wang <yong.y.wang@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Yong Wang 2010-04-23 16:26:42 +08:00 committed by Greg Kroah-Hartman
parent 592ccfebb3
commit bebdf809ee
4 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/rtl8192e/Makefile
View file

@ -18,6 +18,7 @@ r8192e_pci-objs := \
r819xE_firmware.o \
r819xE_cmdpkt.o \
r8192E_dm.o \
r8192_pm.o \
ieee80211/ieee80211_rx.o \
ieee80211/ieee80211_softmac.o \
ieee80211/ieee80211_tx.o \

4
drivers/staging/rtl8192e/r8192E_core.c
View file

@ -62,7 +62,7 @@
//#include <linux/usb.h>
// FIXME: check if 2.6.7 is ok
#ifdef CONFIG_PM_RTL
#ifdef CONFIG_PM
#include "r8192_pm.h"
#endif
@ -146,7 +146,7 @@ static struct pci_driver rtl8192_pci_driver = {
.id_table = rtl8192_pci_id_tbl, /* PCI_ID table */
.probe = rtl8192_pci_probe, /* probe fn */
.remove = __devexit_p(rtl8192_pci_disconnect), /* remove fn */
#ifdef CONFIG_PM_RTL
#ifdef CONFIG_PM
.suspend = rtl8192E_suspend, /* PM suspend fn */
.resume = rtl8192E_resume, /* PM resume fn */
#else

6
drivers/staging/rtl8192e/r8192_pm.c
View file

@ -9,8 +9,6 @@
Released under the terms of GPL (General Public Licence)
*/
#ifdef CONFIG_PM_RTL
#include "r8192E.h"
#include "r8192E_hw.h"
#include "r8192_pm.h"
@ -27,7 +25,9 @@ int rtl8192E_suspend (struct pci_dev *pdev, pm_message_t state)
{
struct net_device *dev = pci_get_drvdata(pdev);
struct r8192_priv *priv = ieee80211_priv(dev);
#ifdef RTL8190P
u8 ucRegRead;
#endif
u32 ulRegRead;
RT_TRACE(COMP_POWER, "============> r8192E suspend call.\n");
@ -168,5 +168,3 @@ int rtl8192E_enable_wake (struct pci_dev *dev, pm_message_t state, int enable)
state.event, enable);
return(-EAGAIN);
}
#endif //CONFIG_PM_RTL

4
drivers/staging/rtl8192e/r8192_pm.h
View file

@ -10,8 +10,6 @@
*/
#ifdef CONFIG_PM_RTL
#ifndef R8192E_PM_H
#define R8192E_PM_H
@ -24,5 +22,3 @@ int rtl8192E_resume (struct pci_dev *dev);
int rtl8192E_enable_wake (struct pci_dev *dev, pm_message_t state, int enable);
#endif //R8192E_PM_H
#endif // CONFIG_PM_RTL