From e18b472e08e502fcca939feb4ee7833539c33241 Mon Sep 17 00:00:00 2001 From: gibbs Date: Sun, 12 May 1996 01:46:11 +0000 Subject: Add missing '+ io_port' to two outbs. Add missing splx() in one error case during probes. Remove unnecessary return and break. Submitted by: Noriyuki Soda --- sys/pci/aic7870.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'sys/pci/aic7870.c') diff --git a/sys/pci/aic7870.c b/sys/pci/aic7870.c index cdd2c1e..89c7c18 100644 --- a/sys/pci/aic7870.c +++ b/sys/pci/aic7870.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aic7870.c,v 1.29 1996/04/20 21:31:27 gibbs Exp $ + * $Id: aic7870.c,v 1.30 1996/05/10 16:26:41 gibbs Exp $ */ #include @@ -398,8 +398,8 @@ aic7870_attach(config_id, unit) default: { printf("ahc: Unknown controller type. Ignoring.\n"); + splx(opri); return; - break; } } @@ -434,9 +434,9 @@ aic7870_attach(config_id, unit) } else our_id = 0x07; - outb(SCSICONF, (our_id & 0x07)|ENSPCHK|RESET_SCSI); + outb(SCSICONF + io_port, (our_id & 0x07)|ENSPCHK|RESET_SCSI); /* In case we are a wide card */ - outb(SCSICONF + 1, our_id); + outb(SCSICONF + 1 + io_port, our_id); if(!ultra_enb || (ahc->flags & AHC_USEDEFAULTS)) { /* @@ -459,7 +459,6 @@ aic7870_attach(config_id, unit) splx(opri); ahc_attach(ahc); - return; } /* -- cgit v1.1