From: Malcolm Priestley Date: Sat, 28 Jun 2014 22:55:45 +0000 (+0100) Subject: staging: vt6656: set BBvSetVGAGainOffset inside vnt_set_bss_mode X-Git-Tag: v3.17-rc1~123^2~1282 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d3584775e94d0baa61a1c2cde7fb93a931e966de;p=~emulex%2Finfiniband.git staging: vt6656: set BBvSetVGAGainOffset inside vnt_set_bss_mode vnt_set_bss_mode changes the state of abyBBVGA so move BBvSetVGAGainOffset to the function. Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index 82d6b640132..1849e34237a 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c @@ -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]); } diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index d8164ecc013..e0ed1bb36c6 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -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;