From 4ae39151bc5f04370b16c4860e6e4dc8fdcac08f Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 25 May 2011 06:41:23 -0300 Subject: [PATCH] --- yaml --- r: 253243 b: refs/heads/master c: 5d9c08dea0c13c09408f97fe61d34c198c4f3277 h: refs/heads/master i: 253241: 334e0001495fed40f66957bfeb255379b895f6a6 253239: dd3752ff4e6be947545af33524bd0044eb268637 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ivtv/ivtvfb.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b27619a4ef33..c51311deea49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7700a0d293ad8b1b1759ad06ac868f9a42fd0951 +refs/heads/master: 5d9c08dea0c13c09408f97fe61d34c198c4f3277 diff --git a/trunk/drivers/media/video/ivtv/ivtvfb.c b/trunk/drivers/media/video/ivtv/ivtvfb.c index 17247451c693..2d5a97431c0a 100644 --- a/trunk/drivers/media/video/ivtv/ivtvfb.c +++ b/trunk/drivers/media/video/ivtv/ivtvfb.c @@ -836,7 +836,8 @@ static int ivtvfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *inf u32 osd_pan_index; struct ivtv *itv = (struct ivtv *) info->par; - osd_pan_index = (var->xoffset + (var->yoffset * var->xres_virtual))*var->bits_per_pixel/8; + osd_pan_index = var->yoffset * info->fix.line_length + + var->xoffset * info->var.bits_per_pixel / 8; write_reg(osd_pan_index, 0x02A0C); /* Pass this info back the yuv handler */