staging/iio driver fixes for 3.19-rc5
Here are 6 staging driver fixes for 3.19-rc5. They fix some reported issues with some IIO drivers, as well as some issues with the vt6655 wireless driver. All have been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlS5WDwACgkQMUfUDdst+ymQlwCeIm6FX0auD5SOlqqGBPvIR6kr 8AoAoISQNfaBmroFcgfi7adGyEKsgkv7 =Ig20 -----END PGP SIGNATURE----- Merge tag 'staging-3.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging driver fixes from Greg KH: "Here are 6 staging driver fixes for 3.19-rc5. They fix some reported issues with some IIO drivers, as well as some issues with the vt6655 wireless driver. All have been in linux-next for a while" * tag 'staging-3.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: vt6655: fix sparse warning: argument type staging: vt6655: Fix loss of distant/weak access points on channel change. staging: vt6655: vnt_tx_packet Fix corrupted tx packets. staging: vt6655: fix sparse warnings: incorrect argument type iio: iio: Fix iio_channel_read return if channel havn't info iio: ad799x: Fix ad7991/ad7995/ad7999 config setup
This commit is contained in:
commit
937102fede
|
@ -143,9 +143,15 @@ static int ad799x_write_config(struct ad799x_state *st, u16 val)
|
|||
case ad7998:
|
||||
return i2c_smbus_write_word_swapped(st->client, AD7998_CONF_REG,
|
||||
val);
|
||||
default:
|
||||
case ad7992:
|
||||
case ad7993:
|
||||
case ad7994:
|
||||
return i2c_smbus_write_byte_data(st->client, AD7998_CONF_REG,
|
||||
val);
|
||||
default:
|
||||
/* Will be written when doing a conversion */
|
||||
st->config = val;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -155,8 +161,13 @@ static int ad799x_read_config(struct ad799x_state *st)
|
|||
case ad7997:
|
||||
case ad7998:
|
||||
return i2c_smbus_read_word_swapped(st->client, AD7998_CONF_REG);
|
||||
default:
|
||||
case ad7992:
|
||||
case ad7993:
|
||||
case ad7994:
|
||||
return i2c_smbus_read_byte_data(st->client, AD7998_CONF_REG);
|
||||
default:
|
||||
/* No readback support */
|
||||
return st->config;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -449,6 +449,9 @@ static int iio_channel_read(struct iio_channel *chan, int *val, int *val2,
|
|||
if (val2 == NULL)
|
||||
val2 = &unused;
|
||||
|
||||
if(!iio_channel_has_info(chan->channel, info))
|
||||
return -EINVAL;
|
||||
|
||||
if (chan->indio_dev->info->read_raw_multi) {
|
||||
ret = chan->indio_dev->info->read_raw_multi(chan->indio_dev,
|
||||
chan->channel, INDIO_MAX_RAW_ELEMENTS,
|
||||
|
|
|
@ -2177,7 +2177,7 @@ bool BBbVT3253Init(struct vnt_private *priv)
|
|||
/* Init ANT B select,RX Config CR10 = 0x28->0x2A, 0x2A->0x28(VC1/VC2 define, make the ANT_A, ANT_B inverted) */
|
||||
/*bResult &= BBbWriteEmbedded(dwIoBase,0x0a,0x28);*/
|
||||
/* Select VC1/VC2, CR215 = 0x02->0x06 */
|
||||
bResult &= BBbWriteEmbedded(dwIoBase, 0xd7, 0x06);
|
||||
bResult &= BBbWriteEmbedded(priv, 0xd7, 0x06);
|
||||
/* }} */
|
||||
|
||||
for (ii = 0; ii < CB_VT3253B0_AGC; ii++)
|
||||
|
|
|
@ -182,6 +182,14 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel)
|
|||
if (pDevice->byCurrentCh == uConnectionChannel)
|
||||
return bResult;
|
||||
|
||||
/* Set VGA to max sensitivity */
|
||||
if (pDevice->bUpdateBBVGA &&
|
||||
pDevice->byBBVGACurrent != pDevice->abyBBVGA[0]) {
|
||||
pDevice->byBBVGACurrent = pDevice->abyBBVGA[0];
|
||||
|
||||
BBvSetVGAGainOffset(pDevice, pDevice->byBBVGACurrent);
|
||||
}
|
||||
|
||||
/* clear NAV */
|
||||
MACvRegBitsOn(pDevice->PortOffset, MAC_REG_MACCR, MACCR_CLRNAV);
|
||||
|
||||
|
|
|
@ -1232,7 +1232,7 @@ static int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
|
|||
|
||||
head_td = priv->apCurrTD[dma_idx];
|
||||
|
||||
head_td->m_td1TD1.byTCR = (TCR_EDP|TCR_STP);
|
||||
head_td->m_td1TD1.byTCR = 0;
|
||||
|
||||
head_td->pTDInfo->skb = skb;
|
||||
|
||||
|
@ -1257,6 +1257,11 @@ static int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
|
|||
|
||||
priv->bPWBitOn = false;
|
||||
|
||||
/* Set TSR1 & ReqCount in TxDescHead */
|
||||
head_td->m_td1TD1.byTCR |= (TCR_STP | TCR_EDP | EDMSDU);
|
||||
head_td->m_td1TD1.wReqCount =
|
||||
cpu_to_le16((u16)head_td->pTDInfo->dwReqCount);
|
||||
|
||||
head_td->pTDInfo->byFlags = TD_FLAGS_NETIF_SKB;
|
||||
|
||||
if (dma_idx == TYPE_AC0DMA)
|
||||
|
@ -1500,9 +1505,11 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
|
|||
if (conf->enable_beacon) {
|
||||
vnt_beacon_enable(priv, vif, conf);
|
||||
|
||||
MACvRegBitsOn(priv, MAC_REG_TCR, TCR_AUTOBCNTX);
|
||||
MACvRegBitsOn(priv->PortOffset, MAC_REG_TCR,
|
||||
TCR_AUTOBCNTX);
|
||||
} else {
|
||||
MACvRegBitsOff(priv, MAC_REG_TCR, TCR_AUTOBCNTX);
|
||||
MACvRegBitsOff(priv->PortOffset, MAC_REG_TCR,
|
||||
TCR_AUTOBCNTX);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1204,13 +1204,10 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
|
|||
|
||||
ptdCurr = (PSTxDesc)pHeadTD;
|
||||
|
||||
ptdCurr->pTDInfo->dwReqCount = cbReqCount - uPadding;
|
||||
ptdCurr->pTDInfo->dwReqCount = cbReqCount;
|
||||
ptdCurr->pTDInfo->dwHeaderLength = cbHeaderLength;
|
||||
ptdCurr->pTDInfo->skb_dma = ptdCurr->pTDInfo->buf_dma;
|
||||
ptdCurr->buff_addr = cpu_to_le32(ptdCurr->pTDInfo->skb_dma);
|
||||
/* Set TSR1 & ReqCount in TxDescHead */
|
||||
ptdCurr->m_td1TD1.byTCR |= (TCR_STP | TCR_EDP | EDMSDU);
|
||||
ptdCurr->m_td1TD1.wReqCount = cpu_to_le16((unsigned short)(cbReqCount));
|
||||
|
||||
return cbHeaderLength;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue