1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index b3860477eceb..0343ae386f03 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -1417,9 +1417,16 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
 
         priv->current_aid = conf->aid;
 
-        if (changed & BSS_CHANGED_BSSID)
+        if (changed & BSS_CHANGED_BSSID) {
+                unsigned long flags;
+
+                spin_lock_irqsave(&priv->lock, flags);
+
                 MACvWriteBSSIDAddress(priv->PortOffset, (u8 *)conf->bssid);
 
+                spin_unlock_irqrestore(&priv->lock, flags);
+        }
+
         if (changed & BSS_CHANGED_BASIC_RATES) {
                 priv->basic_rates = conf->basic_rates;