Unverified Commit cfe956a8 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5831 fbdev: sis: Error out if pixclock equals zero 

Merge Pull Request from: @ci-robot 
 
PR sync from: Jinjiang Tu <tujinjiang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/TUN4KAULJV5TNF7ORD3PQ3IFJXLXQ26S/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9E2MG 
 
Link:https://gitee.com/openeuler/kernel/pulls/5831

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 592508da 9c77371e

drivers/video/fbdev/sis/sis_main.c

+2 −0
Original line number Diff line number Diff line
@@ -1474,6 +1474,8 @@ sisfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) 


	vtotal = var->upper_margin + var->lower_margin + var->vsync_len;



	if (!var->pixclock)

		return -EINVAL;

	pixclock = var->pixclock;



	if((var->vmode & FB_VMODE_MASK) == FB_VMODE_NONINTERLACED) {