summaryrefslogtreecommitdiff
path: root/linux/drivers/media/common
diff options
context:
space:
mode:
authorHans Verkuil <devnull@localhost>2005-12-19 09:37:26 +0000
committerHans Verkuil <devnull@localhost>2005-12-19 09:37:26 +0000
commit1520a3cb54dee708171201dc964a16747079be0d (patch)
treef8579d3f0817f1d8b548d7fb4d2801663f73c9f5 /linux/drivers/media/common
parentc7d2857d16be5edb8e5e2e718012cd350b9a7d7b (diff)
downloadmediapointer-dvb-s2-1520a3cb54dee708171201dc964a16747079be0d.tar.gz
mediapointer-dvb-s2-1520a3cb54dee708171201dc964a16747079be0d.tar.bz2
Revert one 64-bit fix and improved other 64-bit fixes
- Reverted objectionable fix in saa7146_hlp.c - Merged in improved dvb 64-bit fixes from Peter Beutner. Signed-off-by: Peter Beutner <p.beutner@gmx.net> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/common')
-rw-r--r--linux/drivers/media/common/saa7146_hlp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/common/saa7146_hlp.c b/linux/drivers/media/common/saa7146_hlp.c
index a3019c006..8fd7ed5af 100644
--- a/linux/drivers/media/common/saa7146_hlp.c
+++ b/linux/drivers/media/common/saa7146_hlp.c
@@ -563,7 +563,7 @@ static void saa7146_set_position(struct saa7146_dev *dev, int w_x, int w_y, int
int b_depth = vv->ov_fmt->depth;
int b_bpl = vv->ov_fb.fmt.bytesperline;
- u32 base = (u32)(unsigned long)vv->ov_fb.base;
+ u32 base = (u32)vv->ov_fb.base;
struct saa7146_video_dma vdma1;