diff options
| author | Greg Kroah-Hartman | 2015-01-19 03:59:48 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-01-19 03:59:48 +0100 |
| commit | 484c60e206b03fe19129dc6ec4582142293cd876 (patch) | |
| tree | acc3e37a87704133d4a7c55c57136f737356c41a /drivers/staging/vt6655/baseband.c | |
| parent | staging: fbtft: add fbtft_device driver (diff) | |
| parent | Linux 3.19-rc5 (diff) | |
| download | kernel-qcow2-linux-484c60e206b03fe19129dc6ec4582142293cd876.tar.gz kernel-qcow2-linux-484c60e206b03fe19129dc6ec4582142293cd876.tar.xz kernel-qcow2-linux-484c60e206b03fe19129dc6ec4582142293cd876.zip | |
Merge 3.19-rc5 into staging-next
We want the staging fixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655/baseband.c')
| -rw-r--r-- | drivers/staging/vt6655/baseband.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index c138f9b43cc7..ecf7dac0da28 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -2178,7 +2178,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++) |