]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
staging: vt6656: set BBvSetVGAGainOffset inside vnt_set_bss_mode
authorMalcolm Priestley <tvboxspy@gmail.com>
Sat, 28 Jun 2014 22:55:45 +0000 (23:55 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 29 Jun 2014 21:25:53 +0000 (14:25 -0700)
vnt_set_bss_mode changes the state of abyBBVGA so move
BBvSetVGAGainOffset to the function.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/card.c
drivers/staging/vt6656/main_usb.c

index 82d6b640132c98e26792b71947705bc707091d80..1849e34237a5cac88600a279d0ce84c97bece9d8 100644 (file)
@@ -825,4 +825,6 @@ void vnt_set_bss_mode(struct vnt_private *priv)
                priv->abyBBVGA[2] = 0x0;
                priv->abyBBVGA[3] = 0x0;
        }
+
+       BBvSetVGAGainOffset(priv, priv->abyBBVGA[0]);
 }
index d8164ecc01349a78b8e99a94d7207c4327814f2d..e0ed1bb36c6cdd92c7a21bec4ded683d4938530a 100644 (file)
@@ -440,11 +440,6 @@ static int device_init_registers(struct vnt_private *pDevice)
        BBvSetShortSlotTime(pDevice);
        vnt_set_bss_mode(pDevice);
 
-       pDevice->byBBVGACurrent = pDevice->abyBBVGA[0];
-       pDevice->byBBVGANew = pDevice->byBBVGACurrent;
-
-       BBvSetVGAGainOffset(pDevice, pDevice->abyBBVGA[0]);
-
        pDevice->byRadioCtl = pDevice->abyEEPROM[EEP_OFS_RADIOCTL];
        pDevice->bHWRadioOff = false;