[FASTFAT] Fix size checking in VfatGetFileNameInformation()

[reactos.git] / drivers / battery / battc / battc.c

diff --git a/drivers/battery/battc/battc.c b/drivers/battery/battc/battc.c
index 3fc4c25..36f6088 100644 (file)
--- a/drivers/battery/battc/battc.c
+++ b/drivers/battery/battc/battc.c
@@ -51,7 +51,7 @@ BatteryClassSystemControl(PVOID ClassData,
                           PIRP Irp,
                           PVOID Disposition)
 {
-  UNIMPLEMENTED
+  UNIMPLEMENTED;
 
   return STATUS_WMI_GUID_NOT_FOUND;
 }
@@ -67,7 +67,7 @@ BatteryClassQueryWmiDataBlock(PVOID ClassData,
                               ULONG OutBufferSize,
                               PUCHAR Buffer)
 {
-  UNIMPLEMENTED
+  UNIMPLEMENTED;
 
   return STATUS_WMI_GUID_NOT_FOUND;
 }
@@ -151,18 +151,26 @@ BatteryClassInitializeDevice(PBATTERY_MINIPORT_INFO MiniportInfo,
 
   ExInitializeFastMutex(&BattClass->Mutex);
 
-  Status = IoRegisterDeviceInterface(MiniportInfo->Pdo,
-                                     &GUID_DEVICE_BATTERY,
-                                     NULL,
-                                     &BattClass->InterfaceName);
-  if (NT_SUCCESS(Status))
+  if (MiniportInfo->Pdo != NULL)
   {
-      DPRINT("Initialized battery interface: %wZ\n", &BattClass->InterfaceName);
-      IoSetDeviceInterfaceState(&BattClass->InterfaceName, TRUE);
-  }
-  else
-  {
-      DPRINT1("IoRegisterDeviceInterface failed (0x%x)\n", Status);
+    Status = IoRegisterDeviceInterface(MiniportInfo->Pdo,
+                                       &GUID_DEVICE_BATTERY,
+                                       NULL,
+                                       &BattClass->InterfaceName);
+    if (NT_SUCCESS(Status))
+    {
+        DPRINT("Initialized battery interface: %wZ\n", &BattClass->InterfaceName);
+        Status = IoSetDeviceInterfaceState(&BattClass->InterfaceName, TRUE);
+        if (Status == STATUS_OBJECT_NAME_EXISTS)
+        {
+            DPRINT1("Got STATUS_OBJECT_NAME_EXISTS for SetDeviceInterfaceState\n");
+            Status = STATUS_SUCCESS;
+        }
+    }
+    else
+    {
+        DPRINT1("IoRegisterDeviceInterface failed (0x%x)\n", Status);
+    }
   }
 
   *ClassData = BattClass;