[src/trunk]: src/sys/dev/pci When applying the board-specific bits for the SM...

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

details:   https://anonhg.NetBSD.org/src/rev/9eaeb3af6b94
branches:  trunk
changeset: 771128:9eaeb3af6b94
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Thu Nov 10 20:12:48 2011 +0000

description:
When applying the board-specific bits for the SMC 9332,
the mediasw has already been set to non-NULL, don't require it to be NULL.

diffstat:

 sys/dev/pci/if_tlp_pci.c |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (28 lines):

diff -r d96d4f8dad1a -r 9eaeb3af6b94 sys/dev/pci/if_tlp_pci.c
--- a/sys/dev/pci/if_tlp_pci.c  Thu Nov 10 17:18:22 2011 +0000
+++ b/sys/dev/pci/if_tlp_pci.c  Thu Nov 10 20:12:48 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tlp_pci.c,v 1.118 2011/07/26 20:51:24 dyoung Exp $  */
+/*     $NetBSD: if_tlp_pci.c,v 1.119 2011/11/10 20:12:48 jakllsch Exp $        */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.118 2011/07/26 20:51:24 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.119 2011/11/10 20:12:48 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1380,9 +1380,6 @@
 {
        struct tulip_softc *sc = &psc->sc_tulip;
 
-       if (sc->sc_mediasw != NULL) {
-               return;
-       }
        strcpy(psc->sc_tulip.sc_name, "SMC 9332DST");
        sc->sc_mediasw = &tlp_smc9332dst_mediasw;
 }