diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt73usb.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt73usb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index a140170b1eb3..95724ff9c726 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
@@ -1597,13 +1597,14 @@ static void rt73usb_clear_beacon(struct queue_entry *entry) | |||
1597 | { | 1597 | { |
1598 | struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev; | 1598 | struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev; |
1599 | unsigned int beacon_base; | 1599 | unsigned int beacon_base; |
1600 | u32 reg; | 1600 | u32 orig_reg, reg; |
1601 | 1601 | ||
1602 | /* | 1602 | /* |
1603 | * Disable beaconing while we are reloading the beacon data, | 1603 | * Disable beaconing while we are reloading the beacon data, |
1604 | * otherwise we might be sending out invalid data. | 1604 | * otherwise we might be sending out invalid data. |
1605 | */ | 1605 | */ |
1606 | rt2x00usb_register_read(rt2x00dev, TXRX_CSR9, ®); | 1606 | rt2x00usb_register_read(rt2x00dev, TXRX_CSR9, &orig_reg); |
1607 | reg = orig_reg; | ||
1607 | rt2x00_set_field32(®, TXRX_CSR9_BEACON_GEN, 0); | 1608 | rt2x00_set_field32(®, TXRX_CSR9_BEACON_GEN, 0); |
1608 | rt2x00usb_register_write(rt2x00dev, TXRX_CSR9, reg); | 1609 | rt2x00usb_register_write(rt2x00dev, TXRX_CSR9, reg); |
1609 | 1610 | ||
@@ -1614,10 +1615,9 @@ static void rt73usb_clear_beacon(struct queue_entry *entry) | |||
1614 | rt2x00usb_register_write(rt2x00dev, beacon_base, 0); | 1615 | rt2x00usb_register_write(rt2x00dev, beacon_base, 0); |
1615 | 1616 | ||
1616 | /* | 1617 | /* |
1617 | * Enable beaconing again. | 1618 | * Restore beaconing state. |
1618 | */ | 1619 | */ |
1619 | rt2x00_set_field32(®, TXRX_CSR9_BEACON_GEN, 1); | 1620 | rt2x00usb_register_write(rt2x00dev, TXRX_CSR9, orig_reg); |
1620 | rt2x00usb_register_write(rt2x00dev, TXRX_CSR9, reg); | ||
1621 | } | 1621 | } |
1622 | 1622 | ||
1623 | static int rt73usb_get_tx_data_len(struct queue_entry *entry) | 1623 | static int rt73usb_get_tx_data_len(struct queue_entry *entry) |