From: Yang Yingliang Date: Tue, 11 May 2021 11:30:33 +0000 (+0800) Subject: HID: thrustmaster: Switch to kmemdup() when allocate change_request X-Git-Tag: v5.14-rc1~129^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b770932eefb7c0c6319d332023efee87eb12913;p=thirdparty%2Fkernel%2Flinux.git HID: thrustmaster: Switch to kmemdup() when allocate change_request Use kmemdup() helper instead of open-coding to simplify the code when allocate change_request. Signed-off-by: Yang Yingliang Signed-off-by: Jiri Kosina --- diff --git a/drivers/hid/hid-thrustmaster.c b/drivers/hid/hid-thrustmaster.c index f643b1cb112d5..cdc7d82ae9eda 100644 --- a/drivers/hid/hid-thrustmaster.c +++ b/drivers/hid/hid-thrustmaster.c @@ -311,12 +311,13 @@ static int thrustmaster_probe(struct hid_device *hdev, const struct hid_device_i goto error4; } - tm_wheel->change_request = kzalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL); + tm_wheel->change_request = kmemdup(&change_request, + sizeof(struct usb_ctrlrequest), + GFP_KERNEL); if (!tm_wheel->change_request) { ret = -ENOMEM; goto error5; } - memcpy(tm_wheel->change_request, &change_request, sizeof(struct usb_ctrlrequest)); tm_wheel->usb_dev = interface_to_usbdev(to_usb_interface(hdev->dev.parent)); hid_set_drvdata(hdev, tm_wheel);