On Fri, Aug 31, 2012 at 7:22 PM, Gertjan van Wingerde <gwingerde@xxxxxxxxx> wrote: > The register is 16 bits wide, not 32. > > Signed-off-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx> > Cc: <stable@xxxxxxxxxxxxxxx> Acked-by: Ivo van Doorn@xxxxxxxxx> > diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c > index 3aae36b..b3a1d73 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 > diff --git a/drivers/net/wireless/rt2x00/rt2500usb.h b/drivers/net/wireless/rt2x00/rt2500usb.h > index b493306..192531d 100644 > --- a/drivers/net/wireless/rt2x00/rt2500usb.h > +++ b/drivers/net/wireless/rt2x00/rt2500usb.h > @@ -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. > -- > 1.7.11.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
