summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2013-08-28 20:10:56 +0000
committerjkim <jkim@FreeBSD.org>2013-08-28 20:10:56 +0000
commit8071801ca5dbd29cf20ba73e01f4748f7bbfb046 (patch)
treef103efb2638ea1e11e6a3044db57352cba9410da
parent16f0aaff8816d1bca217ef3e759670f35e189f52 (diff)
downloadFreeBSD-src-8071801ca5dbd29cf20ba73e01f4748f7bbfb046.zip
FreeBSD-src-8071801ca5dbd29cf20ba73e01f4748f7bbfb046.tar.gz
Reduce diff against stable/9 slightly.
-rw-r--r--sys/dev/fb/vesa.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/fb/vesa.c b/sys/dev/fb/vesa.c
index c675a54..48067b6 100644
--- a/sys/dev/fb/vesa.c
+++ b/sys/dev/fb/vesa.c
@@ -1506,6 +1506,7 @@ vesa_load_state(video_adapter_t *adp, void *p)
/* Try BIOS POST to restore a sane state. */
(void)vesa_bios_post();
+ bsize = adp->va_buffer_size;
mode = adp->va_mode;
error = vesa_set_mode(adp, adp->va_initial_mode);
if (mode != adp->va_initial_mode)
@@ -1514,10 +1515,8 @@ vesa_load_state(video_adapter_t *adp, void *p)
if (vesa_vmem_buf != NULL) {
if (error == 0 && VESA_MODE(mode)) {
buf = (void *)adp->va_buffer;
- if (buf != NULL) {
- bsize = adp->va_buffer_size;
+ if (buf != NULL)
bcopy(vesa_vmem_buf, buf, bsize);
- }
}
free(vesa_vmem_buf, M_DEVBUF);
vesa_vmem_buf = NULL;
OpenPOWER on IntegriCloud