summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2500usb.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-03-31 19:32:50 -0700
committerDavid S. Miller <davem@davemloft.net>2010-03-31 19:32:50 -0700
commitd5dc056cce9e60528d5eac64efed623d26ffe46f (patch)
treeb5124013d0935be211fd1df702db2f69c581c5ab /drivers/net/wireless/rt2x00/rt2500usb.c
parent00ae702847df5566ce9182e9c895185e2ad1c181 (diff)
parent7371400431389e1df6a2a05ab9882055b8a6ff2c (diff)
downloadlinux-d5dc056cce9e60528d5eac64efed623d26ffe46f.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2500usb.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2500usb.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 9b04964deced..13444b6b3e37 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1643,6 +1643,11 @@ static int rt2500usb_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 =