diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-09-14 19:39:39 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-09-14 19:39:39 +0400 |
| commit | 7a253c2954dad9d70fa2e07b45b55ea4bee6c6c7 (patch) | |
| tree | 3ab1ff21ef1db5dc3f0d5a5a9f198ac39bd71b78 /drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | |
| parent | 6af773e786ad617b0264ebe06ba60675c01f3e51 (diff) | |
| parent | e020a83d0942a5aceac35986500c9834efc8707d (diff) | |
| download | linux-7a253c2954dad9d70fa2e07b45b55ea4bee6c6c7.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192ce/hw.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c index bd0da7ef290b..dd4bb0950a57 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c @@ -994,8 +994,16 @@ static enum version_8192c _rtl92ce_read_chip_version(struct ieee80211_hw *hw) version = (value32 & TYPE_ID) ? VERSION_A_CHIP_92C : VERSION_A_CHIP_88C; } else { - version = (value32 & TYPE_ID) ? VERSION_B_CHIP_92C : - VERSION_B_CHIP_88C; + version = (enum version_8192c) (CHIP_VER_B | + ((value32 & TYPE_ID) ? CHIP_92C_BITMASK : 0) | + ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : 0)); + if ((!IS_CHIP_VENDOR_UMC(version)) && (value32 & + CHIP_VER_RTL_MASK)) { + version = (enum version_8192c)(version | + ((((value32 & CHIP_VER_RTL_MASK) == BIT(12)) + ? CHIP_VENDOR_UMC_B_CUT : CHIP_UNKNOWN) | + CHIP_VENDOR_UMC)); + } } switch (version) { |