Merge branch 'for-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[firefly-linux-kernel-4.4.55.git] / drivers / media / dvb / frontends / drxk_hard.c

diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c
index a414b1f2b6a5a0f2cd1c4dcfef210ea45189f912..60b868faeacfaf372f617ae31885727f701faa32 100644 (file)
--- a/drivers/media/dvb/frontends/drxk_hard.c
+++ b/drivers/media/dvb/frontends/drxk_hard.c
@@ -1380,20 +1380,20 @@ static int DownloadMicrocode(struct drxk_state *state,
                             const u8 pMCImage[], u32 Length)
 {
        const u8 *pSrc = pMCImage;
-       u16 Flags;
-       u16 Drain;
        u32 Address;
        u16 nBlocks;
        u16 BlockSize;
-       u16 BlockCRC;
        u32 offset = 0;
        u32 i;
        int status = 0;
 
        dprintk(1, "\n");
 
-       /* down the drain (we don care about MAGIC_WORD) */
+       /* down the drain (we don't care about MAGIC_WORD) */
+#if 0
+       /* For future reference */
        Drain = (pSrc[0] << 8) | pSrc[1];
+#endif
        pSrc += sizeof(u16);
        offset += sizeof(u16);
        nBlocks = (pSrc[0] << 8) | pSrc[1];
@@ -1410,11 +1410,17 @@ static int DownloadMicrocode(struct drxk_state *state,
                pSrc += sizeof(u16);
                offset += sizeof(u16);
 
+#if 0
+               /* For future reference */
                Flags = (pSrc[0] << 8) | pSrc[1];
+#endif
                pSrc += sizeof(u16);
                offset += sizeof(u16);
 
+#if 0
+               /* For future reference */
                BlockCRC = (pSrc[0] << 8) | pSrc[1];
+#endif
                pSrc += sizeof(u16);
                offset += sizeof(u16);
 
@@ -5829,7 +5835,7 @@ static int WriteGPIO(struct drxk_state *state)
                }
                if (state->UIO_mask & 0x0002) { /* UIO-2 */
                        /* write to io pad configuration register - output mode */
-                       status = write16(state, SIO_PDR_SMA_TX_CFG__A, state->m_GPIOCfg);
+                       status = write16(state, SIO_PDR_SMA_RX_CFG__A, state->m_GPIOCfg);
                        if (status < 0)
                                goto error;
 
@@ -5848,7 +5854,7 @@ static int WriteGPIO(struct drxk_state *state)
                }
                if (state->UIO_mask & 0x0004) { /* UIO-3 */
                        /* write to io pad configuration register - output mode */
-                       status = write16(state, SIO_PDR_SMA_TX_CFG__A, state->m_GPIOCfg);
+                       status = write16(state, SIO_PDR_GPIO_CFG__A, state->m_GPIOCfg);
                        if (status < 0)
                                goto error;