From 405416e4c4766197b06548e9c878ad4ad10a064e Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 28 Nov 2013 11:41:07 +0000 Subject: [PATCH] [vesafb] Skip modes for which we cannot get mode information MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The VirtualBox BIOS fails to retrieve mode information (with status 0x0100) for some modes within the mode list. Skip any such modes, rather than treating this as a fatal error. Reported-by: Robin Smidsrød Signed-off-by: Michael Brown --- src/arch/i386/interface/pcbios/vesafb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/arch/i386/interface/pcbios/vesafb.c b/src/arch/i386/interface/pcbios/vesafb.c index 6b1acba8..90197bff 100644 --- a/src/arch/i386/interface/pcbios/vesafb.c +++ b/src/arch/i386/interface/pcbios/vesafb.c @@ -300,7 +300,7 @@ static int vesafb_select_mode ( unsigned int min_width, unsigned int min_height, DBGC ( &vbe_buf, "VESAFB could not get mode %04x " "information: [%04x] %s\n", mode_number, status, strerror ( rc ) ); - goto err_mode_info; + continue; } DBGC ( &vbe_buf, "VESAFB mode %04x %dx%d %dbpp(%d:%d:%d:%d) " "model %02x [x%d]%s%s%s%s%s\n", mode_number, @@ -348,7 +348,6 @@ static int vesafb_select_mode ( unsigned int min_width, unsigned int min_height, } err_set_mode: - err_mode_info: free ( mode_numbers ); err_mode_list: return rc;