diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-08 19:14:00 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-08 19:14:00 -0200 |
| commit | 13500b89ca7818b9e7259d2451069557fd5ec25d (patch) | |
| tree | 0a09fec147171cb69a633a2529bcba7d17d78458 /linux/drivers/media/video/cx18/cx18-io.h | |
| parent | e5d82c47206f8bd3ab34f728d8861a816f246d8a (diff) | |
| parent | b4b33fdc2da973f70e7086a90704f32007250972 (diff) | |
| download | mediapointer-dvb-s2-13500b89ca7818b9e7259d2451069557fd5ec25d.tar.gz mediapointer-dvb-s2-13500b89ca7818b9e7259d2451069557fd5ec25d.tar.bz2 | |
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-io.h')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-io.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-io.h b/linux/drivers/media/video/cx18/cx18-io.h index e6716dcb1..2635b3a8c 100644 --- a/linux/drivers/media/video/cx18/cx18-io.h +++ b/linux/drivers/media/video/cx18/cx18-io.h @@ -83,10 +83,14 @@ void cx18_writel_expect(struct cx18 *cx, u32 val, void __iomem *addr, u32 eval, u32 mask) { int i; + u32 r; eval &= mask; for (i = 0; i < CX18_MAX_MMIO_WR_RETRIES; i++) { cx18_writel_noretry(cx, val, addr); - if (eval == (cx18_readl(cx, addr) & mask)) + r = cx18_readl(cx, addr); + if (r == 0xffffffff && eval != 0xffffffff) + continue; + if (eval == (r & mask)) break; } } |