hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/drivers/video/fbdev/core/fbmon.c
....@@ -19,7 +19,7 @@
1919 * Generalized Timing Formula is derived from:
2020 *
2121 * GTF Spreadsheet by Andy Morrish (1/5/97)
22
- * available at http://www.vesa.org
22
+ * available at https://www.vesa.org
2323 *
2424 * This file is subject to the terms and conditions of the GNU General Public
2525 * License. See the file COPYING in the main directory of this archive
....@@ -44,7 +44,7 @@
4444 #ifdef DEBUG
4545 #define DPRINTK(fmt, args...) printk(fmt,## args)
4646 #else
47
-#define DPRINTK(fmt, args...)
47
+#define DPRINTK(fmt, args...) no_printk(fmt, ##args)
4848 #endif
4949
5050 #define FBMON_FIX_HEADER 1
....@@ -978,6 +978,8 @@
978978 get_monspecs(edid, specs);
979979
980980 specs->modedb = fb_create_modedb(edid, &specs->modedb_len, specs);
981
+ if (!specs->modedb)
982
+ return;
981983
982984 /*
983985 * Workaround for buggy EDIDs that sets that the first
....@@ -1199,7 +1201,7 @@
11991201 * ignored and @var will be filled with the calculated timings.
12001202 *
12011203 * 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).
12031205 *
12041206 * NOTES:
12051207 * The timings generated by the GTF will be different from VESA
....@@ -1388,8 +1390,8 @@
13881390 if (ret)
13891391 return ret;
13901392
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);
13931395 dump_fb_videomode(fb);
13941396
13951397 return 0;