forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5 
 kernel/drivers/hid/hid-mcp2221.c
....@@ -840,11 +840,18 @@
840840 		return ret;
841841 	}
842842 
843
-	ret = hid_hw_start(hdev, HID_CONNECT_HIDRAW);
843
+	/*
844
+	 * This driver uses the .raw_event callback and therefore does not need any
845
+	 * HID_CONNECT_xxx flags.
846
+	 */
847
+	ret = hid_hw_start(hdev, 0);
844848 	if (ret) {
845849 		hid_err(hdev, "can't start hardware\n");
846850 		return ret;
847851 	}
852
+
853
+	hid_info(hdev, "USB HID v%x.%02x Device [%s] on %s\n", hdev->version >> 8,
854
+			hdev->version & 0xff, hdev->name, hdev->phys);
848855 
849856 	ret = hid_hw_open(hdev);
850857 	if (ret) {
....@@ -870,8 +877,7 @@
870877 	mcp->adapter.retries = 1;
871878 	mcp->adapter.dev.parent = &hdev->dev;
872879 	snprintf(mcp->adapter.name, sizeof(mcp->adapter.name),
873
-			"MCP2221 usb-i2c bridge on hidraw%d",
874
-			((struct hidraw *)hdev->hidraw)->minor);
880
+			"MCP2221 usb-i2c bridge");
875881 
876882 	ret = i2c_add_adapter(&mcp->adapter);
877883 	if (ret) {