Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src/sys/dev/pci Pull up following revision(s) (requested by m...
details: https://anonhg.NetBSD.org/src/rev/56790b84e73f
branches: netbsd-7
changeset: 798928:56790b84e73f
user: snj <snj%NetBSD.org@localhost>
date: Sat Jan 31 07:44:13 2015 +0000
description:
Pull up following revision(s) (requested by martin in ticket #469):
sys/dev/pci/if_fpa.c: revision 1.60
Fix obviously missing "sc->sc_dev = self" initialization.
Might help PR port-i386/49602.
diffstat:
sys/dev/pci/if_fpa.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diffs (27 lines):
diff -r 63688b51bdf8 -r 56790b84e73f sys/dev/pci/if_fpa.c
--- a/sys/dev/pci/if_fpa.c Fri Jan 30 07:54:13 2015 +0000
+++ b/sys/dev/pci/if_fpa.c Sat Jan 31 07:44:13 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fpa.c,v 1.59 2014/03/29 19:28:24 christos Exp $ */
+/* $NetBSD: if_fpa.c,v 1.59.4.1 2015/01/31 07:44:13 snj Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt%3am-software.com@localhost>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fpa.c,v 1.59 2014/03/29 19:28:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fpa.c,v 1.59.4.1 2015/01/31 07:44:13 snj Exp $");
#ifdef __NetBSD__
#include "opt_inet.h"
@@ -410,6 +410,8 @@
aprint_naive(": FDDI controller\n");
+ sc->sc_dev = self;
+
data = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_CFLT);
if ((data & 0xFF00) < (DEFPA_LATENCY << 8)) {
data &= ~0xFF00;
Home |
Main Index |
Thread Index |
Old Index