diff options
| author | gibbs <gibbs@FreeBSD.org> | 1996-05-12 01:46:11 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 1996-05-12 01:46:11 +0000 |
| commit | e18b472e08e502fcca939feb4ee7833539c33241 (patch) | |
| tree | 0641d7ba8db0cb90fb63d726adf9e4575393f6e0 /sys/pci/aic7870.c | |
| parent | 439981bb46ed6ddca9124f5e1ea8f24453732972 (diff) | |
| download | FreeBSD-src-e18b472e08e502fcca939feb4ee7833539c33241.zip FreeBSD-src-e18b472e08e502fcca939feb4ee7833539c33241.tar.gz | |
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 <soda@sra.co.jp>
Diffstat (limited to 'sys/pci/aic7870.c')
| -rw-r--r-- | sys/pci/aic7870.c | 9 |
1 files changed, 4 insertions, 5 deletions
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 <pci.h> @@ -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; } /* |
