Commit c4283950 authored by Colin Ian King's avatar Colin Ian King Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192u: fix a dubious looking mask before a shift 



Currently the masking of ret with 0xff and followed by a right shift
of 8 bits always leaves a zero result.  It appears the mask of 0xff
is incorrect and should be 0xff00, but I don't have the hardware to
test this. Fix this to mask the upper 8 bits before shifting.

[ Not tested ]

Addresses-Coverity: ("Operands don't affect result")
Fixes: 8fc8598e ("Staging: Added Realtek rtl8192u driver to staging")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Link: https://lore.kernel.org/r/20200716154720.1710252-1-colin.king@canonical.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f6b35db0

drivers/staging/rtl8192u/r8192U_core.c

+1 −1
Original line number Diff line number Diff line
@@ -2374,7 +2374,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev) 
				ret = eprom_read(dev, (EEPROM_TX_PW_INDEX_CCK >> 1));

				if (ret < 0)

					return ret;

				priv->EEPROMTxPowerLevelCCK = ((u16)ret & 0xff) >> 8;

				priv->EEPROMTxPowerLevelCCK = ((u16)ret & 0xff00) >> 8;

			} else

				priv->EEPROMTxPowerLevelCCK = 0x10;

			RT_TRACE(COMP_EPROM, "CCK Tx Power Levl: 0x%02x\n", priv->EEPROMTxPowerLevelCCK);