diff options
Diffstat (limited to 'drivers/media/video/cx18/cx18-av-firmware.c')
| -rw-r--r-- | drivers/media/video/cx18/cx18-av-firmware.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/video/cx18/cx18-av-firmware.c b/drivers/media/video/cx18/cx18-av-firmware.c index 924691dcaeb7..cf52e08c2878 100644 --- a/drivers/media/video/cx18/cx18-av-firmware.c +++ b/drivers/media/video/cx18/cx18-av-firmware.c | |||
| @@ -68,8 +68,7 @@ int cx18_av_loadfw(struct cx18 *cx) | |||
| 68 | cx18_av_write4_noretry(cx, CXADEC_DL_CTL, | 68 | cx18_av_write4_noretry(cx, CXADEC_DL_CTL, |
| 69 | dl_control); | 69 | dl_control); |
| 70 | udelay(10); | 70 | udelay(10); |
| 71 | value = cx18_av_read4_noretry(cx, | 71 | value = cx18_av_read4(cx, CXADEC_DL_CTL); |
| 72 | CXADEC_DL_CTL); | ||
| 73 | if (value == dl_control) | 72 | if (value == dl_control) |
| 74 | break; | 73 | break; |
| 75 | /* Check if we can correct the byte by changing | 74 | /* Check if we can correct the byte by changing |
| @@ -80,8 +79,6 @@ int cx18_av_loadfw(struct cx18 *cx) | |||
| 80 | break; | 79 | break; |
| 81 | } | 80 | } |
| 82 | } | 81 | } |
| 83 | cx18_log_write_retries(cx, retries2, | ||
| 84 | cx->reg_mem + 0xc40000 + CXADEC_DL_CTL); | ||
| 85 | if (unrec_err || retries2 >= CX18_MAX_MMIO_WR_RETRIES) | 82 | if (unrec_err || retries2 >= CX18_MAX_MMIO_WR_RETRIES) |
| 86 | break; | 83 | break; |
| 87 | } | 84 | } |