aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMaxim Mikityanskiy <maxtram95@gmail.com>2012-11-13 19:28:22 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-13 12:41:59 -0800
commitfbce428a077f52e33714dabc639a79cfd4ec6af3 (patch)
tree11b88693bb997d84b8a444f1ab6fd2d902d7e5e5 /drivers
parent53094af120e326cd7e092e7d0e479181ca82ad13 (diff)
staging: rtl8187se: Fixed size of BEACON_INTERVAL register
BEACON_INTERVAL register is 16-bit, not 32-bit Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/rtl8187se/r8180_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index 73a6994746f..ea04eec3095 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -1984,10 +1984,10 @@ void rtl8180_link_change(struct net_device *dev)
write_nic_dword(dev, BSSID, ((u32 *)net->bssid)[0]);
write_nic_word(dev, BSSID+4, ((u16 *)net->bssid)[2]);
- beacon_interval = read_nic_dword(dev, BEACON_INTERVAL);
+ beacon_interval = read_nic_word(dev, BEACON_INTERVAL);
beacon_interval &= ~BEACON_INTERVAL_MASK;
beacon_interval |= net->beacon_interval;
- write_nic_dword(dev, BEACON_INTERVAL, beacon_interval);
+ write_nic_word(dev, BEACON_INTERVAL, beacon_interval);
rtl8180_set_mode(dev, EPROM_CMD_NORMAL);