diff options
author | Gertjan van Wingerde <gwingerde@gmail.com> | 2012-08-31 19:22:10 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-02 09:47:37 -0700 |
commit | d89abc3c415b30f16746ef54b75c18c7ef13f66b (patch) | |
tree | 043c1ba9a68d3c09a7b92ce15558be8b14dbc289 /drivers/net/wireless/rt2x00/rt2500usb.c | |
parent | e24fd5136ca6d256900392565dfc895d5a2ed9b2 (diff) | |
download | kernel_samsung_smdk4412-d89abc3c415b30f16746ef54b75c18c7ef13f66b.zip kernel_samsung_smdk4412-d89abc3c415b30f16746ef54b75c18c7ef13f66b.tar.gz kernel_samsung_smdk4412-d89abc3c415b30f16746ef54b75c18c7ef13f66b.tar.bz2 |
rt2x00: Fix word size of rt2500usb MAC_CSR19 register.
commit 6ced58a5dbb94dbfbea1b33ca3c56d1e929cd548 upstream.
The register is 16 bits wide, not 32.
Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Acked-by: Ivo Van Doorn <ivdoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2500usb.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2500usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c index 15237c2..2a34507 100644 --- a/drivers/net/wireless/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/rt2x00/rt2500usb.c @@ -283,7 +283,7 @@ static int rt2500usb_rfkill_poll(struct rt2x00_dev *rt2x00dev) u16 reg; rt2500usb_register_read(rt2x00dev, MAC_CSR19, ®); - return rt2x00_get_field32(reg, MAC_CSR19_BIT7); + return rt2x00_get_field16(reg, MAC_CSR19_BIT7); } #ifdef CONFIG_RT2X00_LIB_LEDS |