From f3db5b4bb53b10d4d0e5be98715b0f5420421c9f Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 8 May 2007 00:37:57 -0700 Subject: [PATCH] --- yaml --- r: 54890 b: refs/heads/master c: abed5d15af4cf864b502b5b0402c7fb39c5c3371 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/fbmem.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 46d7d16899cd..51e4a30568c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 448d479747b85eb2e284c29622d31f5485db6819 +refs/heads/master: abed5d15af4cf864b502b5b0402c7fb39c5c3371 diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c index 8ce98a2f6f37..45f38390605b 100644 --- a/trunk/drivers/video/fbmem.c +++ b/trunk/drivers/video/fbmem.c @@ -354,22 +354,26 @@ static void fb_rotate_logo(struct fb_info *info, u8 *dst, if (rotate == FB_ROTATE_UD) { fb_rotate_logo_ud(image->data, dst, image->width, image->height); - image->dx = info->var.xres - image->width; - image->dy = info->var.yres - image->height; + image->dx = info->var.xres - image->width - image->dx; + image->dy = info->var.yres - image->height - image->dy; } else if (rotate == FB_ROTATE_CW) { fb_rotate_logo_cw(image->data, dst, image->width, image->height); tmp = image->width; image->width = image->height; image->height = tmp; - image->dx = info->var.xres - image->width; + tmp = image->dy; + image->dy = image->dx; + image->dx = info->var.xres - image->width - tmp; } else if (rotate == FB_ROTATE_CCW) { fb_rotate_logo_ccw(image->data, dst, image->width, image->height); tmp = image->width; image->width = image->height; image->height = tmp; - image->dy = info->var.yres - image->height; + tmp = image->dx; + image->dx = image->dy; + image->dy = info->var.yres - image->height - tmp; } image->data = dst;