Browse Source

[vesafb] Skip modes for which we cannot get mode information

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 <robin@smidsrod.no>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 11 years ago
parent
commit
405416e4c4
1 changed files with 1 additions and 2 deletions
  1. 1
    2
      src/arch/i386/interface/pcbios/vesafb.c

+ 1
- 2
src/arch/i386/interface/pcbios/vesafb.c View File

300
 			DBGC ( &vbe_buf, "VESAFB could not get mode %04x "
300
 			DBGC ( &vbe_buf, "VESAFB could not get mode %04x "
301
 			       "information: [%04x] %s\n", mode_number,
301
 			       "information: [%04x] %s\n", mode_number,
302
 			       status, strerror ( rc ) );
302
 			       status, strerror ( rc ) );
303
-			goto err_mode_info;
303
+			continue;
304
 		}
304
 		}
305
 		DBGC ( &vbe_buf, "VESAFB mode %04x %dx%d %dbpp(%d:%d:%d:%d) "
305
 		DBGC ( &vbe_buf, "VESAFB mode %04x %dx%d %dbpp(%d:%d:%d:%d) "
306
 		       "model %02x [x%d]%s%s%s%s%s\n", mode_number,
306
 		       "model %02x [x%d]%s%s%s%s%s\n", mode_number,
348
 	}
348
 	}
349
 
349
 
350
  err_set_mode:
350
  err_set_mode:
351
- err_mode_info:
352
 	free ( mode_numbers );
351
 	free ( mode_numbers );
353
  err_mode_list:
352
  err_mode_list:
354
 	return rc;
353
 	return rc;

Loading…
Cancel
Save