diff options
author | Jaroslav Kysela <perex@perex.cz> | 2010-02-16 11:19:18 +0100 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2010-02-16 11:19:18 +0100 |
commit | ba9341dfef6b0201cd30e3904dcd0a47d3dc35e0 (patch) | |
tree | d83637979db83bb9d5a23e190148b90b60c976d2 /drivers/net/wireless/rt2x00/rt61pci.c | |
parent | ALSA: USB MIDI support for Access Music VirusTI (diff) | |
parent | ALSA: usb-audio: reduce MIDI packet size to work around broken firmware (diff) | |
download | linux-ba9341dfef6b0201cd30e3904dcd0a47d3dc35e0.tar.xz linux-ba9341dfef6b0201cd30e3904dcd0a47d3dc35e0.zip |
Merge branch 'fixes' into devel
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt61pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt61pci.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index 687e17dc2e9f..0ca589306d71 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c @@ -2539,6 +2539,11 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) unsigned int i; /* + * Disable powersaving as default. + */ + rt2x00dev->hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; + + /* * Initialize all hw fields. */ rt2x00dev->hw->flags = |