Index: /trunk/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp	(revision 54809)
+++ /trunk/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp	(revision 54810)
@@ -349,4 +349,6 @@
 static HRESULT vboxDrvCfgInfQueryFirstPnPId(HINF hInf, LPWSTR *lppszPnPId)
 {
+    *lppszPnPId = NULL;
+
     LPWSTR lpszModels;
     LPWSTR lpszPnPId;
@@ -371,14 +373,10 @@
 
         if (hr != S_OK)
-        {
             NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgRegQueryKeyValue for models (%S) failed, hr=0x%x\n", lpszModels, hr));
-        }
     }
     /* free models string right away */
     free(lpszModels);
     if (hr != S_OK)
-    {
         return hr;
-    }
 
     *lppszPnPId = lpszPnPId;