diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/amifb.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index 45c154ade9ca..0c549aa1cf87 100644 --- a/drivers/video/amifb.c +++ b/drivers/video/amifb.c | |||
@@ -2048,13 +2048,16 @@ static void amifb_copyarea(struct fb_info *info, | |||
2048 | width = x2 - dx; | 2048 | width = x2 - dx; |
2049 | height = y2 - dy; | 2049 | height = y2 - dy; |
2050 | 2050 | ||
2051 | if (area->sx + dx < area->dx || area->sy + dy < area->dy) | ||
2052 | return; | ||
2053 | |||
2051 | /* update sx,sy */ | 2054 | /* update sx,sy */ |
2052 | sx = area->sx + (dx - area->dx); | 2055 | sx = area->sx + (dx - area->dx); |
2053 | sy = area->sy + (dy - area->dy); | 2056 | sy = area->sy + (dy - area->dy); |
2054 | 2057 | ||
2055 | /* the source must be completely inside the virtual screen */ | 2058 | /* the source must be completely inside the virtual screen */ |
2056 | if (sx < 0 || sy < 0 || (sx + width) > info->var.xres_virtual || | 2059 | if (sx + width > info->var.xres_virtual || |
2057 | (sy + height) > info->var.yres_virtual) | 2060 | sy + height > info->var.yres_virtual) |
2058 | return; | 2061 | return; |
2059 | 2062 | ||
2060 | if (dy > sy || (dy == sy && dx > sx)) { | 2063 | if (dy > sy || (dy == sy && dx > sx)) { |