diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-11-26 08:47:12 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-11-26 08:47:12 +0100 |
| commit | 891faaaa42567c3609045cff7972d61268b53b8e (patch) | |
| tree | 96dd8ac4262bb382966109878286aa8388103e05 /linux/drivers/media/video/cx18/cx18-av-firmware.c | |
| parent | d6fee5ac91e4b7196341e6da1708ce5b4481cd79 (diff) | |
| parent | 1f3f7671e12715041b3b002db1403ce4da682fda (diff) | |
| download | mediapointer-dvb-s2-891faaaa42567c3609045cff7972d61268b53b8e.tar.gz mediapointer-dvb-s2-891faaaa42567c3609045cff7972d61268b53b8e.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-av-firmware.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-av-firmware.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-av-firmware.c b/linux/drivers/media/video/cx18/cx18-av-firmware.c index 924691dca..c64fd0a05 100644 --- a/linux/drivers/media/video/cx18/cx18-av-firmware.c +++ b/linux/drivers/media/video/cx18/cx18-av-firmware.c @@ -2,6 +2,7 @@ * cx18 ADEC firmware functions * * Copyright (C) 2007 Hans Verkuil <hverkuil@xs4all.nl> + * Copyright (C) 2008 Andy Walls <awalls@radix.net> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -68,8 +69,7 @@ int cx18_av_loadfw(struct cx18 *cx) cx18_av_write4_noretry(cx, CXADEC_DL_CTL, dl_control); udelay(10); - value = cx18_av_read4_noretry(cx, - CXADEC_DL_CTL); + value = cx18_av_read4(cx, CXADEC_DL_CTL); if (value == dl_control) break; /* Check if we can correct the byte by changing @@ -80,8 +80,6 @@ int cx18_av_loadfw(struct cx18 *cx) break; } } - cx18_log_write_retries(cx, retries2, - cx->reg_mem + 0xc40000 + CXADEC_DL_CTL); if (unrec_err || retries2 >= CX18_MAX_MMIO_WR_RETRIES) break; } |