Merge branch android-msm-sunfish-4.14-android13-qpr1 (android-13.0.0_…

…r0.51) JAN 2023.1 Signed-off-by: engstk <[email protected]>
engstk · Jan 9, 2023 · 0d9a232 · 0d9a232
1 parent 570c6d2
commit 0d9a232
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/drivers/hid/hid-steam.c b/drivers/hid/hid-steam.c
@@ -134,6 +134,11 @@ static int steam_recv_report(struct steam_device *steam,
 	int ret;
 
 	r = steam->hdev->report_enum[HID_FEATURE_REPORT].report_id_hash[0];
+	if (!r) {
+		hid_err(steam->hdev, "No HID_FEATURE_REPORT submitted -  nothing to read\n");
+		return -EINVAL;
+	}
+
 	if (hid_report_len(r) < 64)
 		return -EINVAL;
 
@@ -165,6 +170,11 @@ static int steam_send_report(struct steam_device *steam,
 	int ret;
 
 	r = steam->hdev->report_enum[HID_FEATURE_REPORT].report_id_hash[0];
+	if (!r) {
+		hid_err(steam->hdev, "No HID_FEATURE_REPORT submitted -  nothing to read\n");
+		return -EINVAL;
+	}
+
 	if (hid_report_len(r) < 64)
 		return -EINVAL;