aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2005-11-13 16:06:34 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-13 18:14:11 -0800
commit3c8d61bcf2d762fb84dbf741df400c833cada18a (patch)
treef09533e1da3af9d06cae0b2358d52f20a0e8b5e6 /drivers/video
parent[PATCH] rpaphp_pci build fix (diff)
downloadlinux-dev-3c8d61bcf2d762fb84dbf741df400c833cada18a.tar.xz
linux-dev-3c8d61bcf2d762fb84dbf741df400c833cada18a.zip
[PATCH] nvidiafb: Fix bug in nvidiafb_pan_display
nvidiafb_pan_display() is incorrectly using the fields in info->var instead of var passed to the function. Signed-off-by: Antonino Daplas <adaplas@pol.net> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/nvidia/nvidia.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index 0b40a2a721c1..bee09c6e48f6 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -1301,7 +1301,7 @@ static int nvidiafb_pan_display(struct fb_var_screeninfo *var,
struct nvidia_par *par = info->par;
u32 total;
- total = info->var.yoffset * info->fix.line_length + info->var.xoffset;
+ total = var->yoffset * info->fix.line_length + var->xoffset;
NVSetStartAddress(par, total);