[src/netbsd-2]: src/sys/dev/ic Pull up following revision(s) (requested by bo...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/65aaa7a4c24e
branches:  netbsd-2
changeset: 563985:65aaa7a4c24e
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Aug 22 21:29:14 2005 +0000

description:
Pull up following revision(s) (requested by bouyer in ticket #5590):
        sys/dev/ic/aic7xxx.c: revision 1.115
We can't free struct ahc_softc on NetBSD either, because it comes from
config(9). Fix a corruption on alldevs list when an ahc device fails to
initialise.

diffstat:

 sys/dev/ic/aic7xxx.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 6116a8f92132 -r 65aaa7a4c24e sys/dev/ic/aic7xxx.c
--- a/sys/dev/ic/aic7xxx.c      Mon Aug 22 02:02:34 2005 +0000
+++ b/sys/dev/ic/aic7xxx.c      Mon Aug 22 21:29:14 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aic7xxx.c,v 1.109 2004/02/13 11:36:22 wiz Exp $        */
+/*     $NetBSD: aic7xxx.c,v 1.109.4.1 2005/08/22 21:29:14 riz Exp $    */
 
 /*
  * Core routines and tables shareable across OS platforms.
@@ -39,7 +39,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: aic7xxx.c,v 1.109 2004/02/13 11:36:22 wiz Exp $
+ * $Id: aic7xxx.c,v 1.109.4.1 2005/08/22 21:29:14 riz Exp $
  *
  * //depot/aic7xxx/aic7xxx/aic7xxx.c#112 $
  *
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.109 2004/02/13 11:36:22 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.109.4.1 2005/08/22 21:29:14 riz Exp $");
 
 #include <dev/ic/aic7xxx_osm.h>
 #include <dev/ic/aic7xxx_inline.h>
@@ -3967,7 +3967,7 @@
 #endif
        if (ahc->seep_config != NULL)
                free(ahc->seep_config, M_DEVBUF);
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
        free(ahc, M_DEVBUF);
 #endif
        return;