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>

diff --git a/drivers/staging/rt2860/chips/rt3090.c b/drivers/staging/rt2860/chips/rt3090.c
index 156eb36e56f2b09b504f356fd2ced2f952122442..334720ee134511a44d28a6816d311604da7c9ef9 100644 (file)
--- 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 c8f728257197e13d12aa789449fa6e12681d6318..e610d39bdca7d453ea224b13c5b2f7524e1f756d 100644 (file)
--- 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}
        ,