diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2020-10-15 20:41:43 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-10-15 20:41:43 +0200 |
| commit | 9b14b066796d0e8bd05f200f30cb4222f8c0f9f1 (patch) | |
| tree | e5b3daf993db737ebd6a31f9829cc2d07091e33f /drivers/hid/hid-core.c | |
| parent | 146f9d9189b153c3132429578554f3a7896081fc (diff) | |
| parent | 505f394fa239cecb76d916aa858f87ed7ea7fde4 (diff) | |
| download | linux-stable-9b14b066796d0e8bd05f200f30cb4222f8c0f9f1.tar.gz linux-stable-9b14b066796d0e8bd05f200f30cb4222f8c0f9f1.tar.bz2 linux-stable-9b14b066796d0e8bd05f200f30cb4222f8c0f9f1.zip | |
Merge branch 'for-5.9/upstream-fixes' into for-linus
- "heartbeat" report fix for several Wacom devices
- Lenovo X1 Tablet support improvements
- new device IDs
- bounds checking fix in hid-roccat
- stylus battery reporting fix
Diffstat (limited to 'drivers/hid/hid-core.c')
| -rw-r--r-- | drivers/hid/hid-core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 6dbd09254c44..56172fe6995c 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -927,7 +927,7 @@ static int hid_scan_report(struct hid_device *hid) /** * hid_parse_report - parse device report * - * @device: hid device + * @hid: hid device * @start: report start * @size: report size * @@ -952,7 +952,7 @@ static const char * const hid_report_names[] = { /** * hid_validate_values - validate existing device report's value indexes * - * @device: hid device + * @hid: hid device * @type: which report type to examine * @id: which report ID to examine (0 for first) * @field_index: which report field to examine @@ -1451,7 +1451,7 @@ static int search(__s32 *array, __s32 value, unsigned n) * hid_match_report - check if driver's raw_event should be called * * @hid: hid device - * @report_type: type to match against + * @report: hid report to match against * * compare hid->driver->report_table->report_type to report->type */ @@ -2127,7 +2127,7 @@ struct hid_dynid { /** * store_new_id - add a new HID device ID to this driver and re-probe devices - * @driver: target device driver + * @drv: target device driver * @buf: buffer for scanning device ID data * @count: input size * |