diff options
| author | Peter Beutner <p.beutner@gmx.net> | 2006-01-09 12:32:43 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-09 12:32:43 -0500 |
| commit | 400b7083fbcc8e7a1157a82aa126977179873268 (patch) | |
| tree | 67669ca5f0e0ddd6858cf0c7c5b485ec7554ca40 /drivers/media/common | |
| parent | d8e6acf2ec120f3dc7929581d87b5b8b3ff21627 (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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146_hlp.c index be34ec430470..ec52dff8cb69 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 | |||
| 562 | 562 | ||
| 563 | int b_depth = vv->ov_fmt->depth; | 563 | int b_depth = vv->ov_fmt->depth; |
| 564 | int b_bpl = vv->ov_fb.fmt.bytesperline; | 564 | int b_bpl = vv->ov_fb.fmt.bytesperline; |
| 565 | u32 base = (u32)(unsigned long)vv->ov_fb.base; | 565 | u32 base = (u32)vv->ov_fb.base; |
| 566 | 566 | ||
| 567 | struct saa7146_video_dma vdma1; | 567 | struct saa7146_video_dma vdma1; |
| 568 | 568 | ||