Module Name: src
Committed By: riz
Date: Wed Jun 13 19:17:43 UTC 2012
Modified Files:
src/sys/dev/pci [netbsd-6]: eso.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.4.1 src/sys/dev/pci/eso.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/eso.c
diff -u src/sys/dev/pci/eso.c:1.59 src/sys/dev/pci/eso.c:1.59.4.1
--- src/sys/dev/pci/eso.c:1.59 Thu Nov 24 03:35:59 2011
+++ src/sys/dev/pci/eso.c Wed Jun 13 19:17:43 2012
@@ -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 @@ eso_reset(struct eso_softc *sc)
{
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. */
