Module Name: src Committed By: snj Date: Wed Apr 19 17:06:21 UTC 2017
Modified Files: src/sys/dev/pci [netbsd-7]: if_wm.c Log Message: Pull up following revision(s) (requested by kardel in ticket #1385): sys/dev/pci/if_wm.c: revision 1.497 PR kern/52039: use same safeguard as for the 82578 To generate a diff of this commit: cvs rdiff -u -r1.289.2.13 -r1.289.2.14 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/pci/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.289.2.13 src/sys/dev/pci/if_wm.c:1.289.2.14 --- src/sys/dev/pci/if_wm.c:1.289.2.13 Thu Mar 9 06:28:36 2017 +++ src/sys/dev/pci/if_wm.c Wed Apr 19 17:06:21 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.289.2.13 2017/03/09 06:28:36 snj Exp $ */ +/* $NetBSD: if_wm.c,v 1.289.2.14 2017/04/19 17:06:21 snj Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -84,7 +84,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.13 2017/03/09 06:28:36 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.14 2017/04/19 17:06:21 snj Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -11153,7 +11153,7 @@ wm_enable_wakeup(struct wm_softc *sc) /* Assume that the PHY is copper */ child = LIST_FIRST(&sc->sc_mii.mii_phys); - if (child->mii_mpd_rev <= 2) + if ((child != NULL) && (child->mii_mpd_rev <= 2)) sc->sc_mii.mii_writereg(sc->sc_dev, 1, (768 << 5) | 25, 0x0444); /* magic num */ }