From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 14 Dec 2010 19:03:28 +0000 (+0000)
Subject: check that adapter->get_edid is non-NULL
X-Git-Tag: 2.00~1156^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=015e21571c2ecaacb7eb59c2cfde566d1290c445;p=thirdparty%2Fgrub.git

check that adapter->get_edid is non-NULL
---

diff --git a/grub-core/commands/videoinfo.c b/grub-core/commands/videoinfo.c
index 56df943ec..9bd0a0e78 100644
--- a/grub-core/commands/videoinfo.c
+++ b/grub-core/commands/videoinfo.c
@@ -169,7 +169,7 @@ grub_cmd_videoinfo (grub_command_t cmd __attribute__ ((unused)),
 
     adapter->iterate (hook);
 
-    if (adapter->get_edid (&edid_info) == GRUB_ERR_NONE)
+    if (adapter->get_edid && adapter->get_edid (&edid_info) == GRUB_ERR_NONE)
       print_edid (&edid_info);
     else
       grub_errno = GRUB_ERR_NONE;