write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/drivers/hid/hid-alps.c
..
..
@@ -1,10 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  *  Copyright (c) 2016 Masaki Ota <masaki.ota@jp.alps.com>
3
- *
4
- * This program is free software; you can redistribute it and/or modify it
5
- * under the terms of the GNU General Public License as published by the Free
6
- * Software Foundation; either version 2 of the License, or (at your option)
7
- * any later version.
8
4
  */
9
5
 
10
6
 #include <linux/kernel.h>
..
..
@@ -393,8 +389,7 @@
393
389
 				input_report_abs(hdata->input,
394
390
 					ABS_MT_PRESSURE, z);
395
391
 			} else {
396
-				input_mt_report_slot_state(hdata->input,
397
-					MT_TOOL_FINGER, 0);
392
+				input_mt_report_slot_inactive(hdata->input);
398
393
 			}
399
394
 		}
400
395
 
..
..
@@ -531,7 +526,7 @@
531
526
 
532
527
 	ret = u1_read_write_register(hdev, ADDRESS_U1_NUM_SENS_Y,
533
528
 			&sen_line_num_y, 0, true);
534
-		if (ret < 0) {
529
+	if (ret < 0) {
535
530
 		dev_err(&hdev->dev, "failed U1_NUM_SENS_Y (%d)\n", ret);
536
531
 		goto exit;
537
532
 	}
..
..
@@ -836,6 +831,8 @@
836
831
 	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
837
832
 		USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1) },
838
833
 	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
834
+		USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_UNICORN_LEGACY) },
835
+	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
839
836
 		USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_T4_BTNLESS) },
840
837
 	{ }
841
838
 };