diff mbox series

[RFC,2/4] HID: cmedia: directly return fixed up rdesc

Message ID 20240730-hid-const-fixup-v1-2-f667f9a653ba@weissschuh.net (mailing list archive)
State New
Delegated to: Jiri Kosina
Headers show
Series HID: constify static fixed up report descriptors | expand

Commit Message

Thomas Weißschuh July 30, 2024, 9:35 p.m. UTC 
In a future patch the return type of the _report_fixup() callback will
change to "const", but the "rdesc" parameter will stay non-const.
Avoid constness errors in that case by not assigning to rdesc but
returning directly.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
---
 drivers/hid/hid-cmedia.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/drivers/hid/hid-cmedia.c b/drivers/hid/hid-cmedia.c
index cab42047bc99..0681d8882ac8 100644
--- a/drivers/hid/hid-cmedia.c
+++ b/drivers/hid/hid-cmedia.c
@@ -204,8 +204,8 @@  static __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;
 }