summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rt2860
diff options
context:
space:
mode:
authorChen, Chien-Chia <machen@novell.com>2010-12-08 14:20:33 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-08 14:20:56 -0800
commit1226056d9608d241db4b558a0d88a347ad5c66ae (patch)
tree9e9810375dd7a326c00bcec9abd97827e0408a3c /drivers/staging/rt2860
parentea3398a1ae54cd3403f3cc0f6aa498c7452c681a (diff)
downloadlinux-1226056d9608d241db4b558a0d88a347ad5c66ae.tar.bz2
Staging: rt3090: Fix RT3090 scan AP function
Fix RT3090 scan AP function. This patch fixes the rt3090 wireless module failed to scan AP around due to Windows driver causing rt3090 module unable to scan AP in Linux. Acked-by: Lee, Chun-Yi <jlee@novell.com> Signed-off-by: Chen, Chien-Chia <machen@novell.com> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860')
-rw-r--r--drivers/staging/rt2860/chips/rt3090.c3
-rw-r--r--drivers/staging/rt2860/chips/rt30xx.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/rt2860/chips/rt3090.c b/drivers/staging/rt2860/chips/rt3090.c
index 156eb36e56f2..334720ee1345 100644
--- a/drivers/staging/rt2860/chips/rt3090.c
+++ b/drivers/staging/rt2860/chips/rt3090.c
@@ -52,7 +52,8 @@ void NICInitRT3090RFRegisters(struct rt_rtmp_adapter *pAd)
if (IS_RT3090(pAd)) {
/* Init RF calibration */
/* Driver should toggle RF R30 bit7 before init RF registers */
- u32 RfReg = 0, data;
+ u8 RfReg;
+ u32 data;
RT30xxReadRFRegister(pAd, RF_R30, (u8 *)&RfReg);
RfReg |= 0x80;
diff --git a/drivers/staging/rt2860/chips/rt30xx.c b/drivers/staging/rt2860/chips/rt30xx.c
index c8f728257197..e610d39bdca7 100644
--- a/drivers/staging/rt2860/chips/rt30xx.c
+++ b/drivers/staging/rt2860/chips/rt30xx.c
@@ -54,7 +54,7 @@ struct rt_reg_pair RT30xx_RFRegTable[] = {
,
{RF_R06, 0x02}
,
- {RF_R07, 0x70}
+ {RF_R07, 0x60}
,
{RF_R09, 0x0F}
,