from netbsd: move iobase around trickily

1 files changed, 6 insertions, 6 deletions

diff --git a/sys/dev/isa/ultra14f.c b/sys/dev/isa/ultra14f.c
index 078dc9a34c2..a6730d21a94 100644
--- a/sys/dev/isa/ultra14f.c
+++ b/sys/dev/isa/ultra14f.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ultra14f.c,v 1.58 1995/11/10 04:42:07 mycroft Exp $	*/
+/*	$NetBSD: ultra14f.c,v 1.60 1995/12/26 17:16:55 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -535,8 +535,6 @@ uhaprobe(parent, match, aux)
 	struct uha_softc *uha = match;
 	struct isa_attach_args *ia = aux;
 
-	uha->sc_iobase = ia->ia_iobase;
-
 	/*
 	 * Try initialise a unit at this location
 	 * sets up dma and bus speed, loads uha->sc_irq
@@ -911,7 +909,7 @@ u14_find(uha, ia)
 	struct uha_softc *uha;
 	struct isa_attach_args *ia;
 {
-	int iobase = uha->sc_iobase;
+	int iobase = ia->ia_iobase;
 	u_short model, config;
 	int resetcount = 4000;	/* 4 secs? */
 
@@ -979,7 +977,7 @@ u14_find(uha, ia)
 	}
 	if (!resetcount) {
 		printf("%s: board timed out during reset\n",
-			uha->sc_dev.dv_xname);
+		    uha->sc_dev.dv_xname);
 		return ENXIO;
 	}
 
@@ -990,6 +988,7 @@ u14_find(uha, ia)
 	uha->intr = u14intr;
 	uha->init = u14_init;
 
+	uha->sc_iobase = iobase;
 	return 0;
 }
 
@@ -1075,7 +1074,7 @@ u24_find(uha, ia)
 		}
 		if (!resetcount) {
 			printf("%s: board timed out during reset\n",
-				uha->sc_dev.dv_xname);
+			    uha->sc_dev.dv_xname);
 			continue;
 		}
 
@@ -1086,6 +1085,7 @@ u24_find(uha, ia)
 		uha->intr = u24intr;
 		uha->init = u24_init;
 
+		uha->sc_iobase = ia->ia_iobase = iobase;
 		return 0;
 	}