From 798ef4334214119195e11def092d873b23789812 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@collabora.com>
Date: Mon, 2 Sep 2019 13:25:59 +0100
Subject: [PATCH] st/prober: Make sure the usb-product is always filled out

---
 src/xrt/state_trackers/prober/p_prober.c | 29 ++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/xrt/state_trackers/prober/p_prober.c b/src/xrt/state_trackers/prober/p_prober.c
index 69f316f36..5373531c6 100644
--- a/src/xrt/state_trackers/prober/p_prober.c
+++ b/src/xrt/state_trackers/prober/p_prober.c
@@ -198,6 +198,30 @@ p_dev_get_bluetooth_dev(struct prober* p,
  *
  */
 
+static void
+fill_out_product(struct prober* p, struct prober_device* pdev)
+{
+	const char* bus =
+	    pdev->base.bus == XRT_BUS_TYPE_BLUETOOTH ? "bluetooth" : "usb";
+
+	char* str = NULL;
+	int ret = 0;
+	do {
+		ret = snprintf(str, ret, "Unknown %s device: %04x:%04x", bus,
+		               pdev->base.vendor_id, pdev->base.product_id);
+		if (ret <= 0) {
+			return;
+		}
+
+		if (str == NULL) {
+			str = U_CALLOC_WITH_CAST(char, ret + 1);
+		} else {
+			pdev->usb.product = str;
+			return;
+		}
+	} while (true);
+}
+
 static void
 add_device(struct prober* p, struct prober_device** out_dev)
 {
@@ -627,6 +651,10 @@ list_video_devices(struct xrt_prober* xp,
 			continue;
 		}
 
+		if (pdev->usb.product == NULL) {
+			fill_out_product(p, pdev);
+		}
+
 		cb(xp, &pdev->base, pdev->usb.product, ptr);
 	}
 
@@ -656,6 +684,7 @@ get_string_descriptor(struct xrt_prober* xp,
 	//! @todo make this unicode (utf-16)? utf-8 would be better...
 	return 0;
 }
+
 static void
 destroy(struct xrt_prober** xp)
 {