diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 15:38:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 15:38:48 +0200 |
| commit | bda307ed7bdc160fcf1475a49f6c2e796fcb1294 (patch) | |
| tree | aa24926a83001373cb4ac2d8be9fd1b6994e7c60 /drivers/video/atafb.c | |
| parent | 0791e13fbb1ea4e1808d055922c3f116b924bdc9 (diff) | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
| download | op-kernel-dev-bda307ed7bdc160fcf1475a49f6c2e796fcb1294.zip op-kernel-dev-bda307ed7bdc160fcf1475a49f6c2e796fcb1294.tar.gz | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'drivers/video/atafb.c')
| -rw-r--r-- | drivers/video/atafb.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c index fa55d35..77eb8b3 100644 --- a/drivers/video/atafb.c +++ b/drivers/video/atafb.c @@ -2593,13 +2593,16 @@ static void atafb_copyarea(struct fb_info *info, const struct fb_copyarea *area) width = x2 - dx; height = y2 - dy; + if (area->sx + dx < area->dx || area->sy + dy < area->dy) + return; + /* update sx,sy */ sx = area->sx + (dx - area->dx); sy = area->sy + (dy - area->dy); /* the source must be completely inside the virtual screen */ - if (sx < 0 || sy < 0 || (sx + width) > info->var.xres_virtual || - (sy + height) > info->var.yres_virtual) + if (sx + width > info->var.xres_virtual || + sy + height > info->var.yres_virtual) return; if (dy > sy || (dy == sy && dx > sx)) { |
