From 0f274fd5b212096fa213745b1664fa691fdfb70f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 17 Aug 2010 18:22:17 +0000 Subject: [PATCH] * Calmed down CID 1976; the problematic situation should not be able to occur, but I've changed it anyway to make the code clearer. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38206 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/graphics/vesa/vesa.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/add-ons/kernel/drivers/graphics/vesa/vesa.cpp b/src/add-ons/kernel/drivers/graphics/vesa/vesa.cpp index 5dd241a334..6e31f6d870 100644 --- a/src/add-ons/kernel/drivers/graphics/vesa/vesa.cpp +++ b/src/add-ons/kernel/drivers/graphics/vesa/vesa.cpp @@ -242,7 +242,7 @@ remap_frame_buffer(vesa_info& info, addr_t physicalBase, uint32 width, uint32 height, int8 depth, uint32 bytesPerRow, bool initializing) { vesa_shared_info& sharedInfo = *info.shared_info; - addr_t frameBuffer; + addr_t frameBuffer = info.frame_buffer; if (!info.complete_frame_buffer_mapped) { addr_t base = physicalBase; @@ -282,8 +282,7 @@ remap_frame_buffer(vesa_info& info, addr_t physicalBase, uint32 width, if (info.physical_frame_buffer_size != 0) info.complete_frame_buffer_mapped = true; } - } else - frameBuffer = info.frame_buffer; + } if (info.complete_frame_buffer_mapped) frameBuffer += physicalBase - info.physical_frame_buffer;