debug lk

hc

2024-02-20 e636c8d336489bf3eed5878299e6cc045bbad077

 kernel/drivers/video/fbdev/tgafb.c
..
..
@@ -70,7 +70,7 @@
70
70
  *  Frame buffer operations
71
71
  */
72
72
 
73
-static struct fb_ops tgafb_ops = {
73
+static const struct fb_ops tgafb_ops = {
74
74
 	.owner			= THIS_MODULE,
75
75
 	.fb_check_var		= tgafb_check_var,
76
76
 	.fb_set_par		= tgafb_set_par,
..
..
@@ -165,6 +165,9 @@
165
165
 tgafb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
166
166
 {
167
167
 	struct tga_par *par = (struct tga_par *)info->par;
168
+
169
+	if (!var->pixclock)
170
+		return -EINVAL;
168
171
 
169
172
 	if (par->tga_type == TGA_TYPE_8PLANE) {
170
173
 		if (var->bits_per_pixel != 8)
..
..
@@ -989,8 +992,10 @@
989
992
 	/* We can fill 2k pixels per operation.  Notice blocks that fit
990
993
 	   the width of the screen so that we can take advantage of this
991
994
 	   and fill more than one line per write.  */
992
-	if (width == line_length)
993
-		width *= height, height = 1;
995
+	if (width == line_length) {
996
+		width *= height;
997
+		height = 1;
998
+	}
994
999
 
995
1000
 	/* The write into the frame buffer must be aligned to 4 bytes,
996
1001
 	   but we are allowed to encode the offset within the word in
..
..
@@ -1171,8 +1176,10 @@
1171
1176
 	   More than anything else, these control how we do copies.  */
1172
1177
 	depos = dy * line_length + dx;
1173
1178
 	sepos = sy * line_length + sx;
1174
-	if (backward)
1175
-		depos += width, sepos += width;
1179
+	if (backward) {
1180
+		depos += width;
1181
+		sepos += width;
1182
+	}
1176
1183
 
1177
1184
 	/* Next copy full words at a time.  */
1178
1185
 	n32 = width / 32;
..
..
@@ -1416,10 +1423,8 @@
1416
1423
 
1417
1424
 	/* Allocate the fb and par structures.  */
1418
1425
 	info = framebuffer_alloc(sizeof(struct tga_par), dev);
1419
-	if (!info) {
1420
-		printk(KERN_ERR "tgafb: Cannot allocate memory\n");
1426
+	if (!info)
1421
1427
 		return -ENOMEM;
1422
-	}
1423
1428
 
1424
1429
 	par = info->par;
1425
1430
 	dev_set_drvdata(dev, info);
..
..
@@ -1440,7 +1445,7 @@
1440
1445
 	}
1441
1446
 
1442
1447
 	/* Map the framebuffer.  */
1443
-	mem_base = ioremap_nocache(bar0_start, bar0_len);
1448
+	mem_base = ioremap(bar0_start, bar0_len);
1444
1449
 	if (!mem_base) {
1445
1450
 		printk(KERN_ERR "tgafb: Cannot map MMIO\n");
1446
1451
 		goto err1;