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

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c4127f55dfd9
branches:  netbsd-6
changeset: 774217:c4127f55dfd9
user:      riz <riz%NetBSD.org@localhost>
date:      Wed Jun 13 19:17:43 2012 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #332):
        sys/dev/pci/eso.c: revision 1.60
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 00b552c540f7 -r c4127f55dfd9 sys/dev/pci/eso.c
--- a/sys/dev/pci/eso.c Wed Jun 13 19:14:17 2012 +0000
+++ b/sys/dev/pci/eso.c Wed Jun 13 19:17:43 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.59.4.1 2012/06/13 19:17:43 riz 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.59.4.1 2012/06/13 19:17:43 riz 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. */