Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/pci don't kassert that the sc_intr_lock is held in e...



details:   https://anonhg.NetBSD.org/src/rev/1e8f0df4dbf9
branches:  trunk
changeset: 779285:1e8f0df4dbf9
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue May 15 18:11:28 2012 +0000

description:
don't kassert that the sc_intr_lock is held in eso_reset().  it's only
called from attach and doesn't need to have it held, and PR 46451 shows
that it currently asserts.

diffstat:

 sys/dev/pci/eso.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r 2c942b0ce35a -r 1e8f0df4dbf9 sys/dev/pci/eso.c
--- a/sys/dev/pci/eso.c Tue May 15 18:10:02 2012 +0000
+++ b/sys/dev/pci/eso.c Tue May 15 18:11:28 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eso.c,v 1.59 2011/11/24 03:35:59 mrg Exp $     */
+/*     $NetBSD: eso.c,v 1.60 2012/05/15 18:11:28 mrg Exp $     */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.59 2011/11/24 03:35:59 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.60 2012/05/15 18:11:28 mrg Exp $");
 
 #include "mpu.h"
 
@@ -670,8 +670,6 @@
 {
        int i;
 
-       KASSERT(mutex_owned(&sc->sc_intr_lock));
-
        bus_space_write_1(sc->sc_sb_iot, sc->sc_sb_ioh, ESO_SB_RESET,
            ESO_SB_RESET_SW | ESO_SB_RESET_FIFO);
        /* `Delay' suggested in the data sheet. */



Home | Main Index | Thread Index | Old Index