diff --git a/4.18/wacom_sys.c b/4.18/wacom_sys.c
index 66354802..0c26dc15 100644
--- a/4.18/wacom_sys.c
+++ b/4.18/wacom_sys.c
@@ -2267,7 +2267,8 @@ static void wacom_update_name(struct wacom *wacom, const char *suffix)
 		if (wacom_is_using_usb_driver(wacom->hdev)) {
 			struct usb_interface *intf = to_usb_interface(wacom->hdev->dev.parent);
 			struct usb_device *dev = interface_to_usbdev(intf);
-			product_name = dev->product;
+			if (dev->product != NULL)
+				product_name = dev->product;
 		}
 
 		if (wacom->hdev->bus == BUS_I2C) {