移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/video/fbdev/core/fbmon.c
..
..
@@ -19,7 +19,7 @@
19
19
  * Generalized Timing Formula is derived from:
20
20
  *
21
21
  *      GTF Spreadsheet by Andy Morrish (1/5/97)
22
- *      available at http://www.vesa.org
22
+ *      available at https://www.vesa.org
23
23
  *
24
24
  * This file is subject to the terms and conditions of the GNU General Public
25
25
  * License.  See the file COPYING in the main directory of this archive
..
..
@@ -44,7 +44,7 @@
44
44
 #ifdef DEBUG
45
45
 #define DPRINTK(fmt, args...) printk(fmt,## args)
46
46
 #else
47
-#define DPRINTK(fmt, args...)
47
+#define DPRINTK(fmt, args...) no_printk(fmt, ##args)
48
48
 #endif
49
49
 
50
50
 #define FBMON_FIX_HEADER  1
..
..
@@ -978,6 +978,8 @@
978
978
 	get_monspecs(edid, specs);
979
979
 
980
980
 	specs->modedb = fb_create_modedb(edid, &specs->modedb_len, specs);
981
+	if (!specs->modedb)
982
+		return;
981
983
 
982
984
 	/*
983
985
 	 * Workaround for buggy EDIDs that sets that the first
..
..
@@ -1199,7 +1201,7 @@
1199
1201
  * ignored and @var will be filled with the calculated timings.
1200
1202
  *
1201
1203
  * All calculations are based on the VESA GTF Spreadsheet
1202
- * available at VESA's public ftp (http://www.vesa.org).
1204
+ * available at VESA's public ftp (https://www.vesa.org).
1203
1205
  *
1204
1206
  * NOTES:
1205
1207
  * The timings generated by the GTF will be different from VESA
..
..
@@ -1388,8 +1390,8 @@
1388
1390
 	if (ret)
1389
1391
 		return ret;
1390
1392
 
1391
-	pr_debug("%pOF: got %dx%d display mode from %s\n",
1392
-		np, vm.hactive, vm.vactive, np->name);
1393
+	pr_debug("%pOF: got %dx%d display mode\n",
1394
+		np, vm.hactive, vm.vactive);
1393
1395
 	dump_fb_videomode(fb);
1394
1396
 
1395
1397
 	return 0;