aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/common
diff options
context:
space:
mode:
authorPeter Beutner <p.beutner@gmx.net>2006-01-09 15:32:43 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-01-09 15:32:43 -0200
commit400b7083fbcc8e7a1157a82aa126977179873268 (patch)
tree67669ca5f0e0ddd6858cf0c7c5b485ec7554ca40 /drivers/media/common
parentd8e6acf2ec120f3dc7929581d87b5b8b3ff21627 (diff)
V4L/DVB (3194): 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> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media/common')
-rw-r--r--drivers/media/common/saa7146_hlp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146_hlp.c
index be34ec43047..ec52dff8cb6 100644
--- a/drivers/media/common/saa7146_hlp.c
+++ b/drivers/media/common/saa7146_hlp.c
@@ -562,7 +562,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;