Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-7-1]: src/sys/dev/pci Pull up following revision(s) (requested by...



details:   https://anonhg.NetBSD.org/src/rev/3d862d0d8b22
branches:  netbsd-7-1
changeset: 800819:3d862d0d8b22
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Nov 06 09:21:48 2017 +0000

description:
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

diffstat:

 sys/dev/pci/if_wm.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r abdf5451c7a3 -r 3d862d0d8b22 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Sun Nov 05 21:07:32 2017 +0000
+++ b/sys/dev/pci/if_wm.c       Mon Nov 06 09:21:48 2017 +0000
@@ -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.13.2.1 2017/11/06 09:21:48 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.13.2.1 2017/11/06 09:21:48 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -11153,7 +11153,7 @@
 
                        /* 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 */
                }



Home | Main Index | Thread Index | Old Index