Merge branch 'for-6.13' into 'master'

jigpu · jigpu · commit bf62fdd61d8f · 2024-12-09T11:36:21.000-08:00
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -2267,7 +2267,8 @@ static void wacom_update_name(struct wacom wacom, const char suffix)`
`2267`	`2267`	`if (wacom_is_using_usb_driver(wacom->hdev)) {`
`2268`	`2268`	`struct usb_interface *intf = to_usb_interface(wacom->hdev->dev.parent);`
`2269`	`2269`	`struct usb_device *dev = interface_to_usbdev(intf);`
`2270`		`- product_name = dev->product;`
	`2270`	`+ if (dev->product != NULL)`
	`2271`	`+ product_name = dev->product;`
`2271`	`2272`	`}`
`2272`	`2273`
`2273`	`2274`	`if (wacom->hdev->bus == BUS_I2C) {`