Skip to content

Commit f23aa4c

Browse files
committed
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
2 parents 0d2746a + acd5f76 commit f23aa4c

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

drivers/hid/bpf/hid_bpf_struct_ops.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,23 @@ static int __hid_bpf_rdesc_fixup(struct hid_bpf_ctx *ctx)
276276
return 0;
277277
}
278278

279+
static int __hid_bpf_hw_request(struct hid_bpf_ctx *ctx, unsigned char reportnum,
280+
enum hid_report_type rtype, enum hid_class_request reqtype,
281+
u64 source)
282+
{
283+
return 0;
284+
}
285+
286+
static int __hid_bpf_hw_output_report(struct hid_bpf_ctx *ctx, u64 source)
287+
{
288+
return 0;
289+
}
290+
279291
static struct hid_bpf_ops __bpf_hid_bpf_ops = {
280292
.hid_device_event = __hid_bpf_device_event,
281293
.hid_rdesc_fixup = __hid_bpf_rdesc_fixup,
294+
.hid_hw_request = __hid_bpf_hw_request,
295+
.hid_hw_output_report = __hid_bpf_hw_output_report,
282296
};
283297

284298
static struct bpf_struct_ops bpf_hid_bpf_ops = {

0 commit comments

Comments
 (0)