diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c
--- a/sys/kern/subr_intr.c
+++ b/sys/kern/subr_intr.c
@@ -557,6 +557,9 @@
 	struct intr_event *ie;
 	int error;
 
+	if (isrc->isrc_event != NULL)
+		return (0);
+
 	error = intr_event_create(&ie, isrc, 0, isrc->isrc_irq,
 	    intr_isrc_pre_ithread, intr_isrc_post_ithread, intr_isrc_post_filter,
 	    intr_isrc_assign_cpu, "%s:", isrc->isrc_name);
@@ -610,11 +613,9 @@
 {
 	int error;
 
-	if (isrc->isrc_event == NULL) {
-		error = isrc_event_create(isrc);
-		if (error)
-			return (error);
-	}
+	error = isrc_event_create(isrc);
+	if (error)
+		return (error);
 
 	return (intr_event_add_handler(isrc->isrc_event, name, filter, handler,
 	    arg, intr_priority(flags), flags, cookiep));