[src/trunk]: src/sys/arch/xen/xen Don't disestablish a soft interrupt which h...

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

details:   https://anonhg.NetBSD.org/src/rev/789e4ce03b98
branches:  trunk
changeset: 747707:789e4ce03b98
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Sep 27 19:48:57 2009 +0000

description:
Don't disestablish a soft interrupt which has not been established.

diffstat:

 sys/arch/xen/xen/xennetback_xenbus.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 700621cbb0ea -r 789e4ce03b98 sys/arch/xen/xen/xennetback_xenbus.c
--- a/sys/arch/xen/xen/xennetback_xenbus.c      Sun Sep 27 18:52:56 2009 +0000
+++ b/sys/arch/xen/xen/xennetback_xenbus.c      Sun Sep 27 19:48:57 2009 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: xennetback_xenbus.c,v 1.29 2009/09/25 23:11:57 bouyer Exp $      */
+/*      $NetBSD: xennetback_xenbus.c,v 1.30 2009/09/27 19:48:57 bouyer Exp $      */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -380,7 +380,10 @@
        aprint_verbose_ifnet(&xneti->xni_if, "disconnecting\n");
        hypervisor_mask_event(xneti->xni_evtchn);
        event_remove_handler(xneti->xni_evtchn, xennetback_evthandler, xneti);
-       softint_disestablish(xneti->xni_softintr);
+       if (xneti->xni_softintr) {
+               softint_disestablish(xneti->xni_softintr);
+               xneti->xni_softintr = NULL;
+       }
 
        SLIST_REMOVE(&xnetback_instances,
            xneti, xnetback_instance, next);