CVS commit: src/sys/dev/marvell

[Jonathan A. Kollasch]

Module Name:    src
Committed By:   jakllsch
Date:           Fri Jan 28 16:12:23 UTC 2011

Modified Files:
        src/sys/dev/marvell: com_mv.c

Log Message:
Set mva_size in the console case.
Addresses first portion of PR#43990.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/marvell/com_mv.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/marvell/com_mv.c
diff -u src/sys/dev/marvell/com_mv.c:1.4 src/sys/dev/marvell/com_mv.c:1.5
--- src/sys/dev/marvell/com_mv.c:1.4	Sat Sep  4 05:01:20 2010
+++ src/sys/dev/marvell/com_mv.c	Fri Jan 28 16:12:22 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_mv.c,v 1.4 2010/09/04 05:01:20 kiyohara Exp $	*/
+/*	$NetBSD: com_mv.c,v 1.5 2011/01/28 16:12:22 jakllsch Exp $	*/
 /*
  * Copyright (c) 2007, 2010 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_mv.c,v 1.4 2010/09/04 05:01:20 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mv.c,v 1.5 2011/01/28 16:12:22 jakllsch Exp $");
 
 #include "opt_com.h"
 
@@ -88,7 +88,7 @@
 		return 0;
 
 	if (com_is_console(mva->mva_iot, mva->mva_addr + mva->mva_offset, NULL))
-		return 1;
+		goto console;
 
 	if (bus_space_subregion(mva->mva_iot, mva->mva_ioh, mva->mva_offset,
 	    MVUART_SIZE, &ioh))
@@ -97,6 +97,7 @@
 	if (!com_probe_subr(&regs))
 		return 0;
 
+console:
 	mva->mva_size = MVUART_SIZE;
 	return 1;
 }