diff options
| author |  Jakub Kicinski <kuba@kernel.org>
| 2022-12-08 16:07:53 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org>
| 2022-12-08 18:19:59 -0800 |
| commit | 837e8ac871499d337212e2161c046f5adf1bad33 (patch) | |
| tree | 2d7bb495b5ce2bce04bf18afd6a57116391efabc /drivers/hid/hid-uclogic-rdesc.c | |
| parent | Merge branch 'mlx4-better-big-tcp-support' (diff) | |
| parent | Merge tag 'net-6.1-rc9' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-837e8ac871499d337212e2161c046f5adf1bad33.tar.gz linux-837e8ac871499d337212e2161c046f5adf1bad33.tar.bz2 linux-837e8ac871499d337212e2161c046f5adf1bad33.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/hid/hid-uclogic-rdesc.c')
| -rw-r--r-- | drivers/hid/hid-uclogic-rdesc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-uclogic-rdesc.c b/drivers/hid/hid-uclogic-rdesc.c index 4bd54c4fb5b0..6b73eb0df6bd 100644 --- a/drivers/hid/hid-uclogic-rdesc.c +++ b/drivers/hid/hid-uclogic-rdesc.c @@ -1193,7 +1193,7 @@ __u8 *uclogic_rdesc_template_apply(const __u8 *template_ptr, p[sizeof(btn_head)] < param_num) { v = param_list[p[sizeof(btn_head)]]; put_unaligned((__u8)0x2A, p); /* Usage Maximum */ - put_unaligned_le16((__force u16)cpu_to_le16(v), p + 1); + put_unaligned((__force u16)cpu_to_le16(v), (s16 *)(p + 1)); p += sizeof(btn_head) + 1; } else { p++; |