summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev/core/fbcon_cw.c
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2020-08-04 10:58:32 +0300
committerJoel Stanley <joel@jms.id.au>2020-08-04 10:58:36 +0300
commit9524588381df213554a10d3661a9200a4b7f6db2 (patch)
treea4d281b99dcd28b9a1d3077299c26a5671abff88 /drivers/video/fbdev/core/fbcon_cw.c
parent666e403461fd046b37bc95bba49e82ca6a758bea (diff)
parent67da9e2c2b730b9b788ace749d22d769cf11ee2b (diff)
downloadlinux-9524588381df213554a10d3661a9200a4b7f6db2.tar.xz
Merge tag 'v5.7.12' into dev-5.7dev-5.7
This is the 5.7.12 stable release Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/video/fbdev/core/fbcon_cw.c')
-rw-r--r--drivers/video/fbdev/core/fbcon_cw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/core/fbcon_cw.c b/drivers/video/fbdev/core/fbcon_cw.c
index ce08251bfd38..fd098ff17574 100644
--- a/drivers/video/fbdev/core/fbcon_cw.c
+++ b/drivers/video/fbdev/core/fbcon_cw.c
@@ -184,7 +184,7 @@ static void cw_clear_margins(struct vc_data *vc, struct fb_info *info,
region.color = color;
region.rop = ROP_COPY;
- if (rw && !bottom_only) {
+ if ((int) rw > 0 && !bottom_only) {
region.dx = 0;
region.dy = info->var.yoffset + rs;
region.height = rw;
@@ -192,7 +192,7 @@ static void cw_clear_margins(struct vc_data *vc, struct fb_info *info,
info->fbops->fb_fillrect(info, &region);
}
- if (bh) {
+ if ((int) bh > 0) {
region.dx = info->var.xoffset;
region.dy = info->var.yoffset;
region.height = info->var.yres;