diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-02 12:30:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-02 12:30:25 -0700 |
| commit | f23aa4c0761a70bfd046dd5755281667f0769a94 (patch) | |
| tree | 10d779e8a29d89dbeffbbf6d9402eb3319e044d5 | |
| parent | 0d2746a208ea5faaaccf9a5e97ad214cff0942f5 (diff) | |
| parent | acd5f76fd5292c91628e04da83e8b78c986cfa2b (diff) | |
| download | lwn-f23aa4c0761a70bfd046dd5755281667f0769a94.tar.gz lwn-f23aa4c0761a70bfd046dd5755281667f0769a94.zip | |
Merge tag 'hid-for-linus-2024090201' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid
Pull HID fix from Benjamin Tissoires:
- A small fix from the new HID-BPF code.
The HID-BPF CI started failing completely because the BPF tree is now
stricter, exposing a problem in the hid_bpf_ops.
* tag 'hid-for-linus-2024090201' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
HID: bpf: fix cfi stubs for hid_bpf_ops
| -rw-r--r-- | drivers/hid/bpf/hid_bpf_struct_ops.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/hid/bpf/hid_bpf_struct_ops.c b/drivers/hid/bpf/hid_bpf_struct_ops.c index cd696c59ba0f..702c22fae136 100644 --- a/drivers/hid/bpf/hid_bpf_struct_ops.c +++ b/drivers/hid/bpf/hid_bpf_struct_ops.c @@ -276,9 +276,23 @@ static int __hid_bpf_rdesc_fixup(struct hid_bpf_ctx *ctx) return 0; } +static int __hid_bpf_hw_request(struct hid_bpf_ctx *ctx, unsigned char reportnum, + enum hid_report_type rtype, enum hid_class_request reqtype, + u64 source) +{ + return 0; +} + +static int __hid_bpf_hw_output_report(struct hid_bpf_ctx *ctx, u64 source) +{ + return 0; +} + static struct hid_bpf_ops __bpf_hid_bpf_ops = { .hid_device_event = __hid_bpf_device_event, .hid_rdesc_fixup = __hid_bpf_rdesc_fixup, + .hid_hw_request = __hid_bpf_hw_request, + .hid_hw_output_report = __hid_bpf_hw_output_report, }; static struct bpf_struct_ops bpf_hid_bpf_ops = { |