Merge tag 'drm-next-2022-03-24' of git://anongit.freedesktop.org/drm/drm

[uclinux-h8/linux.git] / drivers / video / fbdev / core / fbmem.c

diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index ad9aac0..34d6bb1 100644 (file)
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -397,18 +397,14 @@ static void fb_rotate_logo(struct fb_info *info, u8 *dst,
        } 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;
+               swap(image->width, image->height);
                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;
+               swap(image->width, image->height);
                tmp = image->dx;
                image->dx = image->dy;
                image->dy = info->var.yres - image->height - tmp;