From 347ca5f8598d9d6532908f2dab1b6ae6627fed18 Mon Sep 17 00:00:00 2001 From: Serge Gautherie Date: Sun, 14 Jun 2020 13:49:22 +0200 Subject: [PATCH] [NTOS:IO] IoConnectInterrupt(): Move InterruptObject assignment where it belongs (#6503) Addendum to commit d1258e99f (r16229), supersedes commit adf534b28. CORE-17256 --- ntoskrnl/io/iomgr/irq.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/io/iomgr/irq.c b/ntoskrnl/io/iomgr/irq.c index 0281542b8da..f7af1c73043 100644 --- a/ntoskrnl/io/iomgr/irq.c +++ b/ntoskrnl/io/iomgr/irq.c @@ -70,8 +70,7 @@ IoConnectInterrupt(OUT PKINTERRUPT *InterruptObject, KeInitializeSpinLock(SpinLock); } - /* We first start with a built-in Interrupt inside the I/O Structure */ - *InterruptObject = &IoInterrupt->FirstInterrupt; + /* We first start with a built-in interrupt inside the I/O structure */ Interrupt = (PKINTERRUPT)(IoInterrupt + 1); FirstRun = TRUE; @@ -115,7 +114,6 @@ IoConnectInterrupt(OUT PKINTERRUPT *InterruptObject, } /* And fail */ - *InterruptObject = NULL; return STATUS_INVALID_PARAMETER; } @@ -131,7 +129,8 @@ IoConnectInterrupt(OUT PKINTERRUPT *InterruptObject, } } - /* Return Success */ + /* Return success */ + *InterruptObject = &IoInterrupt->FirstInterrupt; return STATUS_SUCCESS; }