Subject: Patch for recent ncr.c lossage
To: None <current-users@netbsd.org>
From: Jason Thorpe <thorpej@nas.nasa.gov>
List: current-users
Date: 10/05/1999 10:48:34
The following patch (which I have just committed to -current) should fix
the recent ncr.c lossage people have reported following the SCSI changes
I made last week.
Please report success or failure.
-- Jason R. Thorpe <thorpej@nas.nasa.gov>
Index: ncr.c
===================================================================
RCS file: /cvsroot/syssrc/sys/dev/pci/ncr.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -c -r1.85 -r1.86
*** ncr.c 1999/10/05 00:29:41 1.85
--- ncr.c 1999/10/05 17:45:57 1.86
***************
*** 1,4 ****
! /* $NetBSD: ncr.c,v 1.85 1999/10/05 00:29:41 thorpej Exp $ */
/**************************************************************************
**
--- 1,4 ----
! /* $NetBSD: ncr.c,v 1.86 1999/10/05 17:45:57 thorpej Exp $ */
/**************************************************************************
**
***************
*** 1518,1524 ****
#if 0
static char ident[] =
! "\n$NetBSD: ncr.c,v 1.85 1999/10/05 00:29:41 thorpej Exp $\n";
#endif
static const u_long ncr_version = NCR_VERSION * 11
--- 1518,1524 ----
#if 0
static char ident[] =
! "\n$NetBSD: ncr.c,v 1.86 1999/10/05 17:45:57 thorpej Exp $\n";
#endif
static const u_long ncr_version = NCR_VERSION * 11
***************
*** 7543,7550 ****
if (!diff) return;
#ifdef __NetBSD__
! if (diff > xp->sc_link->openings)
! diff = xp->sc_link->openings;
xp->sc_link->openings -= diff;
#else /* !__NetBSD__ */
--- 7543,7550 ----
if (!diff) return;
#ifdef __NetBSD__
! if (diff > (xp->sc_link->openings - xp->sc_link->active))
! diff = (xp->sc_link->openings - xp->sc_link->active);
xp->sc_link->openings -= diff;
#else /* !__NetBSD__ */