1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index bea35be68706..7b26b6ccf1a0 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -768,7 +768,10 @@ static int wmi_dev_match(struct device *dev, struct device_driver *driver)
         struct wmi_block *wblock = dev_to_wblock(dev);
         const struct wmi_device_id *id = wmi_driver->id_table;
 
-        while (id->guid_string) {
+        if (id == NULL)
+                return 0;
+
+        while (*id->guid_string) {
                 uuid_le driver_guid;
 
                 if (WARN_ON(uuid_le_to_bin(id->guid_string, &driver_guid)))