From owner-svn-src-all@FreeBSD.ORG  Wed Aug 28 20:10:56 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id E1D23E85;
 Wed, 28 Aug 2013 20:10:56 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CFAA52464;
 Wed, 28 Aug 2013 20:10:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7SKAuLQ059516;
 Wed, 28 Aug 2013 20:10:56 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7SKAum0059515;
 Wed, 28 Aug 2013 20:10:56 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201308282010.r7SKAum0059515@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 28 Aug 2013 20:10:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255004 - head/sys/dev/fb
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Aug 2013 20:10:57 -0000

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;