b43: N-PHY: store seq mode for proper restoring (follow specs)
authorRafał Miłecki <zajec5@gmail.com>
Sun, 17 Jan 2010 12:04:08 +0000 (13:04 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 19 Jan 2010 21:43:08 +0000 (16:43 -0500)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/b43/phy_n.c

index 99024b02bdbd53461000d3ee6fbc40edbc157146..95190d42372c0dc783f89ce94fc52b7195d76dee 100644 (file)
@@ -897,6 +897,7 @@ static void b43_nphy_force_rf_sequence(struct b43_wldev *dev,
                [B43_RFSEQ_UPDATE_GAINU]        = B43_NPHY_RFSEQTR_UPGU,
        };
        int i;
+       u16 seq_mode = b43_phy_read(dev, B43_NPHY_RFSEQMODE);
 
        B43_WARN_ON(seq >= ARRAY_SIZE(trigger));
 
@@ -910,8 +911,7 @@ static void b43_nphy_force_rf_sequence(struct b43_wldev *dev,
        }
        b43err(dev->wl, "RF sequence status timeout\n");
 ok:
-       b43_phy_mask(dev, B43_NPHY_RFSEQMODE,
-                    ~(B43_NPHY_RFSEQMODE_CAOVER | B43_NPHY_RFSEQMODE_TROVER));
+       b43_phy_write(dev, B43_NPHY_RFSEQMODE, seq_mode);
 }
 
 static void b43_nphy_bphy_init(struct b43_wldev *dev)