git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
boot
/
video-bios.c
diff --git
a/arch/x86/boot/video-bios.c
b/arch/x86/boot/video-bios.c
index 68e65d95cdfd8627a69df2ed1ec7cf33cd392ca4..ed0672a818709b86d8c6ebd6416269434934091e 100644
(file)
--- a/
arch/x86/boot/video-bios.c
+++ b/
arch/x86/boot/video-bios.c
@@
-79,7
+79,7
@@
static int bios_probe(void)
video_bios.modes = GET_HEAP(struct mode_info, 0);
for (mode = 0x14; mode <= 0x7f; mode++) {
- if (
heap_free() < sizeof(struct mode_info
))
+ if (
!heap_free(sizeof(struct mode_info)
))
break;
if (mode_defined(VIDEO_FIRST_BIOS+mode))