2023-07-05 14:09:35

by Wang Ming

[permalink] [raw]
Subject: [PATCH HID v1] HID:hid-magicmouse:Fix repeated initialization

If the first report returns NULL,
there is no need to execute the
hid_register_report function a
second time.

Signed-off-by: Wang Ming <[email protected]>
---
drivers/hid/hid-magicmouse.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index c9c968d4b36a..ae3c78ebb986 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -857,8 +857,10 @@ static int magicmouse_probe(struct hid_device *hdev,
} else { /* USB_DEVICE_ID_APPLE_MAGICTRACKPAD */
report = hid_register_report(hdev, HID_INPUT_REPORT,
TRACKPAD_REPORT_ID, 0);
- report = hid_register_report(hdev, HID_INPUT_REPORT,
- DOUBLE_REPORT_ID, 0);
+ if (report) {
+ report = hid_register_report(hdev, HID_INPUT_REPORT,
+ DOUBLE_REPORT_ID, 0);
+ }
}

if (!report) {
--
2.25.1