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>
This commit is contained in:
Justin T. Gibbs 1996-05-12 01:46:11 +00:00
parent a9313682fc
commit cba01a3fa6

View file

@ -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;
}
/*