From 999bb03a4570fe60430b5e5589ab9cb75f560ac2 Mon Sep 17 00:00:00 2001
From: morg <morgan.guimard@gmail.com>
Date: Tue, 14 Nov 2023 08:43:06 +0100
Subject: [PATCH] Piix4 SMBus: set HANDLE initial value to prevent a crash on
 rescan

---
 i2c_smbus/i2c_smbus_piix4.cpp | 6 +++---
 i2c_smbus/i2c_smbus_piix4.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/i2c_smbus/i2c_smbus_piix4.cpp b/i2c_smbus/i2c_smbus_piix4.cpp
index 52acf81e..d870914e 100644
--- a/i2c_smbus/i2c_smbus_piix4.cpp
+++ b/i2c_smbus/i2c_smbus_piix4.cpp
@@ -26,7 +26,7 @@ i2c_smbus_piix4::i2c_smbus_piix4()
     if(amd_smbus_reduce_cpu)
     {
         delay_timer = CreateWaitableTimerExW(NULL, NULL, CREATE_WAITABLE_TIMER_MANUAL_RESET | CREATE_WAITABLE_TIMER_HIGH_RESOLUTION, TIMER_ALL_ACCESS);
-        if(!delay_timer) // high resolution timer not supported
+        if(delay_timer == NULL) // high resolution timer not supported
         {
             delay_timer = CreateWaitableTimer(NULL, TRUE, NULL); // create regular timer instead
         }
@@ -45,7 +45,7 @@ i2c_smbus_piix4::i2c_smbus_piix4()
 
 i2c_smbus_piix4::~i2c_smbus_piix4()
 {
-    if(delay_timer)
+    if(delay_timer != NULL)
     {
         CloseHandle(delay_timer);
     }
@@ -84,7 +84,7 @@ int i2c_smbus_piix4::piix4_transaction()
 
     /* We will always wait for a fraction of a second! (See PIIX4 docs errata) */
     temp = 0;
-    if(delay_timer)
+    if(delay_timer != NULL)
     {
         LARGE_INTEGER retry_delay;
         retry_delay.QuadPart = -2500;
diff --git a/i2c_smbus/i2c_smbus_piix4.h b/i2c_smbus/i2c_smbus_piix4.h
index 71bb1be7..6835693c 100644
--- a/i2c_smbus/i2c_smbus_piix4.h
+++ b/i2c_smbus/i2c_smbus_piix4.h
@@ -51,6 +51,6 @@ private:
     s32 piix4_access(u16 addr, char read_write, u8 command, int size, i2c_smbus_data *data);
     s32 i2c_smbus_xfer(u8 addr, char read_write, u8 command, int size, i2c_smbus_data* data);
     s32 i2c_xfer(u8 addr, char read_write, int* size, u8* data);
-    HANDLE delay_timer;
+    HANDLE delay_timer = NULL;
     HANDLE global_smbus_access_handle = NULL;
 };