ARM: OMAP2+: Fix booting with configs that don't have MFD_SYSCON

[firefly-linux-kernel-4.4.55.git] / drivers / staging / vt6655 / card.c

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index a0796405c308be6b36e1caae217ff92d860bb7b7..1cdcf49b2445094ba5270011251dfe86684766e4 100644 (file)
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -68,8 +68,8 @@
 
 /*---------------------  Static Variables  --------------------------*/
 
-static const unsigned short cwRXBCNTSFOff[MAX_RATE] =
-{17, 17, 17, 17, 34, 23, 17, 11, 8, 5, 4, 3};
+static const unsigned short cwRXBCNTSFOff[MAX_RATE] = {
+       17, 17, 17, 17, 34, 23, 17, 11, 8, 5, 4, 3};
 
 /*---------------------  Static Functions  --------------------------*/
 
@@ -670,6 +670,9 @@ void CARDvSetRSPINF(struct vnt_private *pDevice, u8 bb_type)
 {
        union vnt_phy_field_swap phy;
        unsigned char byTxRate, byRsvTime;      /* For OFDM */
+       unsigned long flags;
+
+       spin_lock_irqsave(&pDevice->lock, flags);
 
        /* Set to Page1 */
        MACvSelectPage1(pDevice->PortOffset);
@@ -767,6 +770,8 @@ void CARDvSetRSPINF(struct vnt_private *pDevice, u8 bb_type)
        VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_72, MAKEWORD(byTxRate, byRsvTime));
        /* Set to Page0 */
        MACvSelectPage0(pDevice->PortOffset);
+
+       spin_unlock_irqrestore(&pDevice->lock, flags);
 }
 
 void CARDvUpdateBasicTopRate(struct vnt_private *pDevice)