diff options
| author |   Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-07-21 11:25:06 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-21 12:09:27 -0700 |
| commit | d0b39f87427c806b984c57d52148200af9c57bf2 (patch) | |
| tree | d1ee919dfbfe40240a1f72f7303119b61a502e9f /drivers/staging/rtl8723au/hal/usb_halinit.c | |
| parent | staging: rtl8723au: Remove a pile of fluff for calling into a bunch of no-op functions (diff) | |
| download | linux-dev-d0b39f87427c806b984c57d52148200af9c57bf2.tar.xz linux-dev-d0b39f87427c806b984c57d52148200af9c57bf2.zip | |
staging: rtl8723au: Fold rtl8723a_set_nav_upper() into rtl8723au_hal_init()
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8723au/hal/usb_halinit.c')
| -rw-r--r-- | drivers/staging/rtl8723au/hal/usb_halinit.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/rtl8723au/hal/usb_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c index b51762a10d78..d896d06c627d 100644 --- a/drivers/staging/rtl8723au/hal/usb_halinit.c +++ b/drivers/staging/rtl8723au/hal/usb_halinit.c @@ -780,7 +780,9 @@ static int rtl8723au_hal_init(struct rtw_adapter *Adapter) rtl8723a_InitHalDm(Adapter); - rtl8723a_set_nav_upper(Adapter, WiFiNavUpperUs); + val8 = ((WiFiNavUpperUs + HAL_8723A_NAV_UPPER_UNIT - 1) / + HAL_8723A_NAV_UPPER_UNIT); + rtl8723au_write8(Adapter, REG_NAV_UPPER, val8); /* 2011/03/09 MH debug only, UMC-B cut pass 2500 S5 test, but we need to fin root cause. */ if (((rtl8723au_read32(Adapter, rFPGA0_RFMOD) & 0xFF000000) != |