Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ced58a5 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Fix word size of rt2500usb MAC_CSR19 register. 



The register is 16 bits wide, not 32.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Cc: <stable@vger.kernel.org>
Acked-by: default avatarIvo Van Doorn <ivdoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 177ef836

drivers/net/wireless/rt2x00/rt2500usb.c

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static int rt2500usb_rfkill_poll(struct rt2x00_dev *rt2x00dev) 
	u16 reg;



	rt2500usb_register_read(rt2x00dev, MAC_CSR19, &reg);

	return rt2x00_get_field32(reg, MAC_CSR19_BIT7);

	return rt2x00_get_field16(reg, MAC_CSR19_BIT7);

}



#ifdef CONFIG_RT2X00_LIB_LEDS

drivers/net/wireless/rt2x00/rt2500usb.h

+8 −8
Original line number Diff line number Diff line
@@ -189,14 +189,14 @@ 
 * MAC_CSR19: GPIO control register.

 */

#define MAC_CSR19			0x0426

#define MAC_CSR19_BIT0			FIELD32(0x0001)

#define MAC_CSR19_BIT1			FIELD32(0x0002)

#define MAC_CSR19_BIT2			FIELD32(0x0004)

#define MAC_CSR19_BIT3			FIELD32(0x0008)

#define MAC_CSR19_BIT4			FIELD32(0x0010)

#define MAC_CSR19_BIT5			FIELD32(0x0020)

#define MAC_CSR19_BIT6			FIELD32(0x0040)

#define MAC_CSR19_BIT7			FIELD32(0x0080)

#define MAC_CSR19_BIT0			FIELD16(0x0001)

#define MAC_CSR19_BIT1			FIELD16(0x0002)

#define MAC_CSR19_BIT2			FIELD16(0x0004)

#define MAC_CSR19_BIT3			FIELD16(0x0008)

#define MAC_CSR19_BIT4			FIELD16(0x0010)

#define MAC_CSR19_BIT5			FIELD16(0x0020)

#define MAC_CSR19_BIT6			FIELD16(0x0040)

#define MAC_CSR19_BIT7			FIELD16(0x0080)



/*

 * MAC_CSR20: LED control register.