Zebediah Figura : ntoskrnl.exe: Properly handle already-loaded drivers in handle_bus_relations().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 48504a2cc7f6b0c6f66d0ae4a76c8b01130234bc
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=48504a2cc7f6b0c6f66d0ae4a...

Author: Zebediah Figura <z.figura12(a)gmail.com>
Date:   Mon Jan 14 20:29:52 2019 -0600

ntoskrnl.exe: Properly handle already-loaded drivers in handle_bus_relations().

This fixes a regression introduced by d498780294c635f67aee823bc030151a6b75bee4.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46469
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/ntoskrnl.exe/ntoskrnl.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index d8a87a6..c46418e 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -3758,9 +3758,7 @@ static void handle_bus_relations( DEVICE_OBJECT *device )
     strcatW( buffer, driver );
     RtlInitUnicodeString( &string, buffer );
     status = ZwLoadDriver( &string );
-    if (status == STATUS_IMAGE_ALREADY_LOADED)
-        return;
-    else if (status != STATUS_SUCCESS)
+    if (status != STATUS_SUCCESS && status != STATUS_IMAGE_ALREADY_LOADED)
     {
         ERR_(plugplay)( "Failed to load driver %s\n", debugstr_w(driver) );
         return;