]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
HID: steelseries: constify fixed up report descriptor
authorThomas Weißschuh <linux@weissschuh.net>
Wed, 28 Aug 2024 07:33:28 +0000 (09:33 +0200)
committerBenjamin Tissoires <bentiss@kernel.org>
Thu, 5 Sep 2024 14:20:57 +0000 (16:20 +0200)
Now that the HID core can handle const report descriptors,
constify them where possible.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Link: https://patch.msgid.link/20240828-hid-const-fixup-2-v1-9-663b9210eb69@weissschuh.net
Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
drivers/hid/hid-steelseries.c

index 895da49e8ead0b4ab0813f81470d4002ebc3c5e1..7e83fee1ffa043a756d416e0a02de0734e6909e3 100644 (file)
@@ -51,7 +51,7 @@ struct steelseries_srws1_data {
  * appear in the 'Generic Desktop' usage.
  */
 
-static __u8 steelseries_srws1_rdesc_fixed[] = {
+static const __u8 steelseries_srws1_rdesc_fixed[] = {
 0x05, 0x01,         /*  Usage Page (Desktop)                */
 0x09, 0x08,         /*  Usage (MultiAxis), Changed          */
 0xA1, 0x01,         /*  Collection (Application),           */
@@ -580,8 +580,8 @@ static const __u8 *steelseries_srws1_report_fixup(struct hid_device *hdev,
        if (*rsize >= 115 && rdesc[11] == 0x02 && rdesc[13] == 0xc8
                        && rdesc[29] == 0xbb && rdesc[40] == 0xc5) {
                hid_info(hdev, "Fixing up Steelseries SRW-S1 report descriptor\n");
-               rdesc = steelseries_srws1_rdesc_fixed;
                *rsize = sizeof(steelseries_srws1_rdesc_fixed);
+               return steelseries_srws1_rdesc_fixed;
        }
        return rdesc;
 }