Merge branch 'for-6.6/sensor-hub' into for-linus

Benjamin Tissoires · Benjamin Tissoires · commit 141a1289f405 · 2023-08-31T10:45:16.000+02:00
Allow multi-function sensor devices in sensor-hub by Daniel Thompson
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
@@ -632,7 +632,7 @@ static int sensor_hub_probe(struct hid_device *hdev,
 	}
 	INIT_LIST_HEAD(&hdev->inputs);
 
-	ret = hid_hw_start(hdev, 0);
+	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
 	if (ret) {
 		hid_err(hdev, "hw start failed\n");
 		return ret;

Original file line number	Diff line number	Diff line change
`@@ -632,7 +632,7 @@ static int sensor_hub_probe(struct hid_device *hdev,`
`632`	`632`	`}`
`633`	`633`	`INIT_LIST_HEAD(&hdev->inputs);`
`634`	`634`
`635`		`- ret = hid_hw_start(hdev, 0);`
	`635`	`+ ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);`
`636`	`636`	`if (ret) {`
`637`	`637`	`hid_err(hdev, "hw start failed\n");`
`638`	`638`	`return ret;`