1 files changed, 21 insertions, 4 deletions

diff --git a/drivers/net/wireless/b43/phy_common.c b/drivers/net/wireless/b43/phy_common.c
index 3cbef21b4726..1dfc682a8055 100644
--- a/drivers/net/wireless/b43/phy_common.c
+++ b/drivers/net/wireless/b43/phy_common.c
@@ -222,12 +222,18 @@ static inline void assert_mac_suspended(struct b43_wldev *dev)
 u16 b43_radio_read(struct b43_wldev *dev, u16 reg)
 {
         assert_mac_suspended(dev);
+        dev->phy.writes_counter = 0;
         return dev->phy.ops->radio_read(dev, reg);
 }
 
 void b43_radio_write(struct b43_wldev *dev, u16 reg, u16 value)
 {
         assert_mac_suspended(dev);
+        if (b43_bus_host_is_pci(dev->dev) &&
+            ++dev->phy.writes_counter > B43_MAX_WRITES_IN_ROW) {
+                b43_read32(dev, B43_MMIO_MACCTL);
+                dev->phy.writes_counter = 1;
+        }
         dev->phy.ops->radio_write(dev, reg, value);
 }
 
@@ -268,17 +274,28 @@ u16 b43_phy_read(struct b43_wldev *dev, u16 reg)
 {
         assert_mac_suspended(dev);
         dev->phy.writes_counter = 0;
-        return dev->phy.ops->phy_read(dev, reg);
+
+        if (dev->phy.ops->phy_read)
+                return dev->phy.ops->phy_read(dev, reg);
+
+        b43_write16f(dev, B43_MMIO_PHY_CONTROL, reg);
+        return b43_read16(dev, B43_MMIO_PHY_DATA);
 }
 
 void b43_phy_write(struct b43_wldev *dev, u16 reg, u16 value)
 {
         assert_mac_suspended(dev);
-        dev->phy.ops->phy_write(dev, reg, value);
-        if (++dev->phy.writes_counter == B43_MAX_WRITES_IN_ROW) {
+        if (b43_bus_host_is_pci(dev->dev) &&
+            ++dev->phy.writes_counter > B43_MAX_WRITES_IN_ROW) {
                 b43_read16(dev, B43_MMIO_PHY_VER);
-                dev->phy.writes_counter = 0;
+                dev->phy.writes_counter = 1;
         }
+
+        if (dev->phy.ops->phy_write)
+                return dev->phy.ops->phy_write(dev, reg, value);
+
+        b43_write16f(dev, B43_MMIO_PHY_CONTROL, reg);
+        b43_write16(dev, B43_MMIO_PHY_DATA, value);
 }
 
 void b43_phy_copy(struct b43_wldev *dev, u16 destreg, u16 srcreg)