system76-thelio-io: Fix probing of non-hwmon interfaces

Author: jackpot51

drivers/hwmon/system76-thelio-io.c

@@ -279,30 +279,55 @@ static const struct hwmon_chip_info thelio_io_chip_info = {
 	.info = thelio_io_info,
 };
 
-static int thelio_io_probe(struct hid_device *hdev, const struct hid_device_id *id)
+static int thelio_io_probe_cmd_dev(struct hid_device *hdev)
 {
 	struct thelio_io_device *thelio_io;
 	int ret;
 
-	ret = hid_parse(hdev);
+	thelio_io = devm_kzalloc(&hdev->dev, sizeof(*thelio_io), GFP_KERNEL);
+	if (!thelio_io)
+		return -ENOMEM;
+
+	thelio_io->buffer = devm_kmalloc(&hdev->dev, BUFFER_SIZE, GFP_KERNEL);
+	if (!thelio_io->buffer)
+		return -ENOMEM;
+
+	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
 	if (ret)
 		return ret;
 
-	if (hdev->rsize != 34) {
-		// Wrong report size
-		return -ENODEV;
-	}
+	ret = hid_hw_open(hdev);
+	if (ret)
+		goto out_hw_stop;
 
-	if (hdev->maxcollection != 1) {
-		// Wrong number of collections
-		return -ENODEV;
-	}
+	thelio_io->hdev = hdev;
+	hid_set_drvdata(hdev, thelio_io);
+	mutex_init(&thelio_io->mutex);
+	init_completion(&thelio_io->wait_input_report);
 
-	if (hdev->collection[0].usage != 0xFF600061) {
-		// Wrong collection usage
-		return -ENODEV;
+	hid_device_io_start(hdev);
+
+	thelio_io->hwmon_dev = hwmon_device_register_with_info(&hdev->dev, "system76_thelio_io",
+							 thelio_io, &thelio_io_chip_info, 0);
+	if (IS_ERR(thelio_io->hwmon_dev)) {
+		ret = PTR_ERR(thelio_io->hwmon_dev);
+		goto out_hw_close;
 	}
 
+	return 0;
+
+out_hw_close:
+	hid_hw_close(hdev);
+out_hw_stop:
+	hid_hw_stop(hdev);
+	return ret;
+}
+
+static int thelio_io_probe(struct hid_device *hdev, const struct hid_device_id *id)
+{
+	struct thelio_io_device *thelio_io;
+	int ret;
+
 	thelio_io = devm_kzalloc(&hdev->dev, sizeof(*thelio_io), GFP_KERNEL);
 	if (!thelio_io)
 		return -ENOMEM;
@@ -311,7 +336,11 @@ static int thelio_io_probe(struct hid_device *hdev, const struct hid_device_id *
 	if (!thelio_io->buffer)
 		return -ENOMEM;
 
-	ret = hid_hw_start(hdev, HID_CONNECT_HIDRAW);
+	ret = hid_parse(hdev);
+	if (ret)
+		return ret;
+
+	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
 	if (ret)
 		return ret;
 
@@ -326,11 +355,14 @@ static int thelio_io_probe(struct hid_device *hdev, const struct hid_device_id *
 
 	hid_device_io_start(hdev);
 
-	thelio_io->hwmon_dev = hwmon_device_register_with_info(&hdev->dev, "system76_thelio_io",
-							 thelio_io, &thelio_io_chip_info, 0);
-	if (IS_ERR(thelio_io->hwmon_dev)) {
-		ret = PTR_ERR(thelio_io->hwmon_dev);
-		goto out_hw_close;
+	if (hdev->maxcollection == 1 && hdev->collection[0].usage == 0xFF600061) {
+		hid_info(hdev, "found command device\n");
+		thelio_io->hwmon_dev = hwmon_device_register_with_info(&hdev->dev, "system76_thelio_io",
+								 thelio_io, &thelio_io_chip_info, 0);
+		if (IS_ERR(thelio_io->hwmon_dev)) {
+			ret = PTR_ERR(thelio_io->hwmon_dev);
+			goto out_hw_close;
+		}
 	}
 
 	return 0;
@@ -346,7 +378,9 @@ static void thelio_io_remove(struct hid_device *hdev)
 {
 	struct thelio_io_device *thelio_io = hid_get_drvdata(hdev);
 
-	hwmon_device_unregister(thelio_io->hwmon_dev);
+	if (thelio_io->hwmon_dev) {
+		hwmon_device_unregister(thelio_io->hwmon_dev);
+	}
 	hid_hw_close(hdev);
 	hid_hw_stop(hdev);
 }