Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci Set CTRL_MEHE correctly (PCH_{LPT, SPT} only).
details: https://anonhg.NetBSD.org/src/rev/7a36ebb1536f
branches: trunk
changeset: 819034:7a36ebb1536f
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Mon Nov 14 05:38:39 2016 +0000
description:
Set CTRL_MEHE correctly (PCH_{LPT,SPT} only).
diffstat:
sys/dev/pci/if_wm.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diffs (30 lines):
diff -r f82c3719c5f7 -r 7a36ebb1536f sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c Mon Nov 14 04:55:57 2016 +0000
+++ b/sys/dev/pci/if_wm.c Mon Nov 14 05:38:39 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.443 2016/11/10 08:35:24 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.444 2016/11/14 05:38:39 msaitoh 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.443 2016/11/10 08:35:24 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.444 2016/11/14 05:38:39 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -5200,9 +5200,8 @@
reg |= PBECCSTS_UNCORR_ECC_ENABLE;
CSR_WRITE(sc, WMREG_PBECCSTS, reg);
- reg = CSR_READ(sc, WMREG_CTRL);
- reg |= CTRL_MEHE;
- CSR_WRITE(sc, WMREG_CTRL, reg);
+ sc->sc_ctrl |= CTRL_MEHE;
+ CSR_WRITE(sc, WMREG_CTRL, sc->sc_ctrl);
break;
default:
break;
Home |
Main Index |
Thread Index |
Old Index