From owner-svn-src-all@FreeBSD.ORG  Wed May 26 16:37:55 2010
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3DA85106566C;
	Wed, 26 May 2010 16:37:55 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2CA238FC16;
	Wed, 26 May 2010 16:37:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4QGbsTF099491;
	Wed, 26 May 2010 16:37:54 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4QGbstv099489;
	Wed, 26 May 2010 16:37:54 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201005261637.o4QGbstv099489@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 26 May 2010 16:37:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208567 - head/sys/isa
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 26 May 2010 16:37:55 -0000

Author: jkim
Date: Wed May 26 16:37:54 2010
New Revision: 208567
URL: http://svn.freebsd.org/changeset/base/208567

Log:
  Do not attempt to switch to the same VTs between suspend and resume.

Modified:
  head/sys/isa/syscons_isa.c

Modified: head/sys/isa/syscons_isa.c
==============================================================================
--- head/sys/isa/syscons_isa.c	Wed May 26 15:39:43 2010	(r208566)
+++ head/sys/isa/syscons_isa.c	Wed May 26 16:37:54 2010	(r208567)
@@ -119,14 +119,15 @@ scsuspend(device_t dev)
 	if (sc->cur_scp == NULL)
 		return (0);
 
-	if (sc->suspend_in_progress == 0 && !sc_no_suspend_vtswitch) {
+	if (sc->suspend_in_progress == 0) {
 		sc_cur_scr = sc->cur_scp->index;
-		do {
-			sc_switch_scr(sc, 0);
-			if (!sc->switch_in_progress)
-				break;
-			pause("scsuspend", hz);
-		} while (retry--);
+		if (!sc_no_suspend_vtswitch && sc_cur_scr != 0)
+			do {
+				sc_switch_scr(sc, 0);
+				if (!sc->switch_in_progress)
+					break;
+				pause("scsuspend", hz);
+			} while (retry--);
 	}
 	sc->suspend_in_progress++;
 
@@ -141,8 +142,9 @@ scresume(device_t dev)
 	sc = &main_softc;
 
 	sc->suspend_in_progress--;
-	if (sc->suspend_in_progress == 0 && !sc_no_suspend_vtswitch)
-		sc_switch_scr(sc, sc_cur_scr);
+	if (sc->suspend_in_progress == 0)
+		if (!sc_no_suspend_vtswitch && sc_cur_scr != 0)
+			sc_switch_scr(sc, sc_cur_scr);
 
 	return (0);
 }