Module Name: src
Committed By: dyoung
Date: Thu Nov 12 20:28:32 UTC 2009
Modified Files:
src/sys/dev/isa: com_isa.c
Log Message:
Call the common detach routine, com_detach(), and get out on error,
before starting the bus-specific detachment.
com_activate() is going away, so don't use it any more.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/isa/com_isa.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/isa/com_isa.c
diff -u src/sys/dev/isa/com_isa.c:1.35 src/sys/dev/isa/com_isa.c:1.36
--- src/sys/dev/isa/com_isa.c:1.35 Thu Apr 2 00:09:33 2009
+++ src/sys/dev/isa/com_isa.c Thu Nov 12 20:28:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: com_isa.c,v 1.35 2009/04/02 00:09:33 dyoung Exp $ */
+/* $NetBSD: com_isa.c,v 1.36 2009/11/12 20:28:32 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.35 2009/04/02 00:09:33 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.36 2009/11/12 20:28:32 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -108,7 +108,7 @@
CFATTACH_DECL3_NEW(com_isa, sizeof(struct com_isa_softc),
- com_isa_probe, com_isa_attach, com_isa_detach, com_activate,
+ com_isa_probe, com_isa_attach, com_isa_detach, NULL,
NULL, NULL, DVF_DETACH_SHUTDOWN);
int
@@ -252,14 +252,14 @@
const struct com_regs *cr = &sc->sc_regs;
int rc;
+ if ((rc = com_detach(self, flags)) != 0)
+ return rc;
+
if (isc->sc_ih != NULL)
isa_intr_disestablish(isc->sc_ic, isc->sc_ih);
pmf_device_deregister(self);
- if ((rc = com_detach(self, flags)) != 0)
- return rc;
-
com_cleanup(self, 0);
#ifdef COM_HAYESP
