From 3a5be629f46151d46516a238c00c226c06e560ea Mon Sep 17 00:00:00 2001 From: Vasily Khoruzhick Date: Fri, 11 Mar 2011 11:20:49 +0200 Subject: [PATCH] --- yaml --- r: 243467 b: refs/heads/master c: dcf8eee94f7eb2671e6d5774e81d45ad06b4f980 h: refs/heads/master i: 243465: f11500751f96ad6686350426a26f6028e5728b7d 243463: 5cd97dd7af4c5c88d780a415dd46d257f8ef6fa1 v: v3 --- [refs] | 2 +- trunk/drivers/video/pxafb.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1fa2684b421f..e2ce9e7b2a7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7779cee3f45122d2f81397f55d7a14f654a0b276 +refs/heads/master: dcf8eee94f7eb2671e6d5774e81d45ad06b4f980 diff --git a/trunk/drivers/video/pxafb.c b/trunk/drivers/video/pxafb.c index e2f643ef9516..a3bdcc152671 100644 --- a/trunk/drivers/video/pxafb.c +++ b/trunk/drivers/video/pxafb.c @@ -761,7 +761,7 @@ static int overlayfb_check_var(struct fb_var_screeninfo *var, int xpos, ypos, pfor, bpp; xpos = NONSTD_TO_XPOS(var->nonstd); - ypos = NONSTD_TO_XPOS(var->nonstd); + ypos = NONSTD_TO_YPOS(var->nonstd); pfor = NONSTD_TO_PFOR(var->nonstd); bpp = pxafb_var_to_bpp(var); @@ -842,7 +842,7 @@ static int overlayfb_set_par(struct fb_info *info) bpp = pxafb_var_to_bpp(var); xpos = NONSTD_TO_XPOS(var->nonstd); - ypos = NONSTD_TO_XPOS(var->nonstd); + ypos = NONSTD_TO_YPOS(var->nonstd); pfor = NONSTD_TO_PFOR(var->nonstd); ofb->control[0] = OVLxC1_PPL(var->xres) | OVLxC1_LPO(var->yres) |