From 52d88a728211ed7ce0657ee71d722df30176719b Mon Sep 17 00:00:00 2001
From: jackun <jack.un@gmail.com>
Date: Tue, 24 Nov 2020 17:33:49 +0200
Subject: [PATCH] USB: check that HidD_GetPreparsedData succeeded

---
 pcsx2/USB/usb-pad/raw/raw-config.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pcsx2/USB/usb-pad/raw/raw-config.cpp b/pcsx2/USB/usb-pad/raw/raw-config.cpp
index 595367e351..f6a4292bc9 100644
--- a/pcsx2/USB/usb-pad/raw/raw-config.cpp
+++ b/pcsx2/USB/usb-pad/raw/raw-config.cpp
@@ -301,14 +301,21 @@ namespace usb_pad
 
 				if (usbHandle == INVALID_HANDLE_VALUE)
 				{
-					Console.Warning("Could not open device %i\n", i);
+					Console.Warning("Could not open device %i", i);
 					free(didData);
 					i++;
 					continue;
 				}
 
 				HidD_GetAttributes(usbHandle, &attr);
-				HidD_GetPreparsedData(usbHandle, &pPreparsedData);
+				if (!HidD_GetPreparsedData(usbHandle, &pPreparsedData))
+				{
+					Console.Warning("Could not get preparsed data from %04x:%04x", attr.VendorID, attr.ProductID);
+					free(didData);
+					i++;
+					continue;
+				}
+
 				HidP_GetCaps(pPreparsedData, &caps);
 
 				if (caps.UsagePage == HID_USAGE_PAGE_GENERIC &&