diff options
Diffstat (limited to 'drivers/media/dvb/frontends/drxk_hard.c')
-rw-r--r-- | drivers/media/dvb/frontends/drxk_hard.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c index a414b1f2b6a5..60b868faeacf 100644 --- 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, | |||
1380 | const u8 pMCImage[], u32 Length) | 1380 | const u8 pMCImage[], u32 Length) |
1381 | { | 1381 | { |
1382 | const u8 *pSrc = pMCImage; | 1382 | const u8 *pSrc = pMCImage; |
1383 | u16 Flags; | ||
1384 | u16 Drain; | ||
1385 | u32 Address; | 1383 | u32 Address; |
1386 | u16 nBlocks; | 1384 | u16 nBlocks; |
1387 | u16 BlockSize; | 1385 | u16 BlockSize; |
1388 | u16 BlockCRC; | ||
1389 | u32 offset = 0; | 1386 | u32 offset = 0; |
1390 | u32 i; | 1387 | u32 i; |
1391 | int status = 0; | 1388 | int status = 0; |
1392 | 1389 | ||
1393 | dprintk(1, "\n"); | 1390 | dprintk(1, "\n"); |
1394 | 1391 | ||
1395 | /* down the drain (we don care about MAGIC_WORD) */ | 1392 | /* down the drain (we don't care about MAGIC_WORD) */ |
1393 | #if 0 | ||
1394 | /* For future reference */ | ||
1396 | Drain = (pSrc[0] << 8) | pSrc[1]; | 1395 | Drain = (pSrc[0] << 8) | pSrc[1]; |
1396 | #endif | ||
1397 | pSrc += sizeof(u16); | 1397 | pSrc += sizeof(u16); |
1398 | offset += sizeof(u16); | 1398 | offset += sizeof(u16); |
1399 | nBlocks = (pSrc[0] << 8) | pSrc[1]; | 1399 | nBlocks = (pSrc[0] << 8) | pSrc[1]; |
@@ -1410,11 +1410,17 @@ static int DownloadMicrocode(struct drxk_state *state, | |||
1410 | pSrc += sizeof(u16); | 1410 | pSrc += sizeof(u16); |
1411 | offset += sizeof(u16); | 1411 | offset += sizeof(u16); |
1412 | 1412 | ||
1413 | #if 0 | ||
1414 | /* For future reference */ | ||
1413 | Flags = (pSrc[0] << 8) | pSrc[1]; | 1415 | Flags = (pSrc[0] << 8) | pSrc[1]; |
1416 | #endif | ||
1414 | pSrc += sizeof(u16); | 1417 | pSrc += sizeof(u16); |
1415 | offset += sizeof(u16); | 1418 | offset += sizeof(u16); |
1416 | 1419 | ||
1420 | #if 0 | ||
1421 | /* For future reference */ | ||
1417 | BlockCRC = (pSrc[0] << 8) | pSrc[1]; | 1422 | BlockCRC = (pSrc[0] << 8) | pSrc[1]; |
1423 | #endif | ||
1418 | pSrc += sizeof(u16); | 1424 | pSrc += sizeof(u16); |
1419 | offset += sizeof(u16); | 1425 | offset += sizeof(u16); |
1420 | 1426 | ||
@@ -5829,7 +5835,7 @@ static int WriteGPIO(struct drxk_state *state) | |||
5829 | } | 5835 | } |
5830 | if (state->UIO_mask & 0x0002) { /* UIO-2 */ | 5836 | if (state->UIO_mask & 0x0002) { /* UIO-2 */ |
5831 | /* write to io pad configuration register - output mode */ | 5837 | /* write to io pad configuration register - output mode */ |
5832 | status = write16(state, SIO_PDR_SMA_TX_CFG__A, state->m_GPIOCfg); | 5838 | status = write16(state, SIO_PDR_SMA_RX_CFG__A, state->m_GPIOCfg); |
5833 | if (status < 0) | 5839 | if (status < 0) |
5834 | goto error; | 5840 | goto error; |
5835 | 5841 | ||
@@ -5848,7 +5854,7 @@ static int WriteGPIO(struct drxk_state *state) | |||
5848 | } | 5854 | } |
5849 | if (state->UIO_mask & 0x0004) { /* UIO-3 */ | 5855 | if (state->UIO_mask & 0x0004) { /* UIO-3 */ |
5850 | /* write to io pad configuration register - output mode */ | 5856 | /* write to io pad configuration register - output mode */ |
5851 | status = write16(state, SIO_PDR_SMA_TX_CFG__A, state->m_GPIOCfg); | 5857 | status = write16(state, SIO_PDR_GPIO_CFG__A, state->m_GPIOCfg); |
5852 | if (status < 0) | 5858 | if (status < 0) |
5853 | goto error; | 5859 | goto error; |
5854 | 5860 | ||