Author: jkim
Date: Wed Aug 28 20:10:56 2013
New Revision: 255004
URL: http://svnweb.freebsd.org/changeset/base/255004
Log:
Reduce diff against stable/9 slightly.
Modified:
head/sys/dev/fb/vesa.c
Modified: head/sys/dev/fb/vesa.c
==============================================================================
--- head/sys/dev/fb/vesa.c Wed Aug 28 20:07:00 2013 (r255003)
+++ head/sys/dev/fb/vesa.c Wed Aug 28 20:10:56 2013 (r255004)
@@ -1506,6 +1506,7 @@ vesa_load_state(video_adapter_t *adp, vo
/* 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, vo
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;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
