aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Shukla <sachin.s5@samsung.com>2017-02-08 10:44:00 -0500
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2017-02-08 10:44:00 -0500
commit0704916a4b24b0f5db9e3e8a39e906247a50e30f (patch)
treee5b999550ce3560470e3f191a6481ca421c1d26e
parent8018ce3f20c570e1ae75a42d924ee97db8cad82a (diff)
video: fbdev: fsl-diu-fb: remove impossible condition
xoffset and yoffset of struct fb_var_screeninfo are unsigned and so they can never be less than 0. Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: sachiniiitm@gmail.com Cc: ravikant.s2@samsung.com Cc: p.shailesh@samsung.com Cc: ashish.kalra@samsung.com Cc: vidushi.koul@samsung.com Signed-off-by: Sachin Shukla <sachin.s5@samsung.com> Acked-by: Timur Tabi <timur@tabi.org> [b.zolnierkie: split from the bigger patch] Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
-rw-r--r--drivers/video/fbdev/fsl-diu-fb.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/video/fbdev/fsl-diu-fb.c b/drivers/video/fbdev/fsl-diu-fb.c
index fe00a07c122e..c48a59e35fae 100644
--- a/drivers/video/fbdev/fsl-diu-fb.c
+++ b/drivers/video/fbdev/fsl-diu-fb.c
@@ -703,12 +703,6 @@ static int fsl_diu_check_var(struct fb_var_screeninfo *var,
703 if (var->yres_virtual < var->yres) 703 if (var->yres_virtual < var->yres)
704 var->yres_virtual = var->yres; 704 var->yres_virtual = var->yres;
705 705
706 if (var->xoffset < 0)
707 var->xoffset = 0;
708
709 if (var->yoffset < 0)
710 var->yoffset = 0;
711
712 if (var->xoffset + info->var.xres > info->var.xres_virtual) 706 if (var->xoffset + info->var.xres > info->var.xres_virtual)
713 var->xoffset = info->var.xres_virtual - info->var.xres; 707 var->xoffset = info->var.xres_virtual - info->var.xres;
714 708
@@ -1254,8 +1248,7 @@ static int fsl_diu_pan_display(struct fb_var_screeninfo *var,
1254 (info->var.yoffset == var->yoffset)) 1248 (info->var.yoffset == var->yoffset))
1255 return 0; /* No change, do nothing */ 1249 return 0; /* No change, do nothing */
1256 1250
1257 if (var->xoffset < 0 || var->yoffset < 0 1251 if (var->xoffset + info->var.xres > info->var.xres_virtual
1258 || var->xoffset + info->var.xres > info->var.xres_virtual
1259 || var->yoffset + info->var.yres > info->var.yres_virtual) 1252 || var->yoffset + info->var.yres > info->var.yres_virtual)
1260 return -EINVAL; 1253 return -EINVAL;
1261 1254