diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-23 15:04:29 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-23 15:04:29 +1000 |
| commit | deea1f8385c1442328b3f306f686d2b5bbbedb6d (patch) | |
| tree | e0802f49be69008a810c9941712774c65ee52c84 /drivers/staging/rtl8192e/r8190_rtl8256.c | |
| parent | c819ac6708193825b7f7acdd6cc940824af46f13 (diff) | |
| parent | 6227157f0cceb092d3e9c6d16ac33f2539a10400 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
Diffstat (limited to 'drivers/staging/rtl8192e/r8190_rtl8256.c')
| -rw-r--r-- | drivers/staging/rtl8192e/r8190_rtl8256.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/rtl8192e/r8190_rtl8256.c b/drivers/staging/rtl8192e/r8190_rtl8256.c index 7391f5f8f25f..8bd5b173a7d2 100644 --- a/drivers/staging/rtl8192e/r8190_rtl8256.c +++ b/drivers/staging/rtl8192e/r8190_rtl8256.c @@ -501,13 +501,13 @@ SetRFPowerState8190( if((priv->ieee80211->eRFPowerState == eRfOff) && RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC)) { // The current RF state is OFF and the RF OFF level is halting the NIC, re-initialize the NIC. bool rtstatus = true; - u32 InitilizeCount = 3; + u32 InitializeCount = 3; do { - InitilizeCount--; + InitializeCount--; priv->RegRfOff = false; rtstatus = NicIFEnableNIC(dev); - }while( (rtstatus != true) &&(InitilizeCount >0) ); + }while( (rtstatus != true) &&(InitializeCount >0) ); if(rtstatus != true) { |