]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
HID: cmedia: constify fixed up report descriptor
authorThomas Weißschuh <linux@weissschuh.net>
Sat, 3 Aug 2024 12:34:23 +0000 (14:34 +0200)
committerBenjamin Tissoires <bentiss@kernel.org>
Tue, 27 Aug 2024 14:30:43 +0000 (16:30 +0200)
The HID core now allows static report descriptors to be read-only,
make use of it.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Link: https://patch.msgid.link/20240803-hid-const-fixup-v2-7-f53d7a7b29d8@weissschuh.net
Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
drivers/hid/hid-cmedia.c

index 01009c95613c66984b9c4ff6054cc5e329b8c1ab..528d7f361215769f9db989831009ba945eacfb67 100644 (file)
@@ -26,7 +26,7 @@ MODULE_LICENSE("GPL");
 /* Fixed report descriptor of HS-100B audio chip
  * Bit 4 is an abolute Microphone mute usage instead of being unassigned.
  */
-static __u8 hs100b_rdesc_fixed[] = {
+static const __u8 hs100b_rdesc_fixed[] = {
        0x05, 0x0C,         /*  Usage Page (Consumer),          */
        0x09, 0x01,         /*  Usage (Consumer Control),       */
        0xA1, 0x01,         /*  Collection (Application),       */
@@ -204,8 +204,8 @@ static const __u8 *cmhid_hs100b_report_fixup(struct hid_device *hid, __u8 *rdesc
 {
        if (*rsize == HS100B_RDESC_ORIG_SIZE) {
                hid_info(hid, "Fixing CMedia HS-100B report descriptor\n");
-               rdesc = hs100b_rdesc_fixed;
                *rsize = sizeof(hs100b_rdesc_fixed);
+               return hs100b_rdesc_fixed;
        }
        return rdesc;
 }