Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Wang Ming <machel@vivo.com>
To:     Jiri Kosina <jikos@kernel.org>,
        Benjamin Tissoires <benjamin.tissoires@redhat.com>,
        linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     opensource.kernel@vivo.com, Wang Ming <machel@vivo.com>
Subject: [PATCH HID v1] HID:hid-magicmouse:Fix repeated initialization
Date:   Wed,  5 Jul 2023 21:46:56 +0800
Message-Id: <20230705134714.2801-1-machel@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5V9MQaAY0j7vuTo/Nd2sOw0f81FpVzvnj/36DgMK3iczLrRQauMvQ33c0R1w?=
 =?us-ascii?Q?XhmZqnOWvdCr6Q5430zBm4HvClbSPOvNTv5veoqGMrcdoIsGguBpyndJfEiq?=
 =?us-ascii?Q?fiaQbqIKlWrpp/5MiWSw6zThQWdQwI8tODWmsCfnE6c2AvrAbOLOXQor5+DW?=
 =?us-ascii?Q?0NNU8rF4fUcQHcuq2Vrcpmy572L+6SfABKeMfS4WSyk9bYjgAB8oNFsWWJ/o?=
 =?us-ascii?Q?XyQayTVbjv2Ea81p60InCAqPqpF0hz1LjDgAUvmDqXfP4iaFCp7r20/Avlbh?=
 =?us-ascii?Q?Jtos4drfkXxmuI3Y7ZwftI9yg0Aoh9rE9SvcYdpMFbAU2VOzSTuo+fQbtL2p?=
 =?us-ascii?Q?5NnXpvM/jiFMGcu5nx5tNx+r1YzhWlVyg+iy2yYCshMK6tune3vIuNIsxzXv?=
 =?us-ascii?Q?LdE1y+HavWFSYbXS5eWzEIHszLMJ/iSwGJhrZJZl3G8L9TVsDOKoADwU9ad+?=
 =?us-ascii?Q?IcQ8hk9TUbUojlOgTqCcega83htu9yvwLlu0ptZznEbX2LnGxv1yYUswgCZW?=
 =?us-ascii?Q?9+d3EL4jQeVJC0/lKIrTmn5DosmYyp1pXe20vlfnn8jBA0aWyVAyG3YabxHw?=
 =?us-ascii?Q?0qVH8qUOBQ8JYHd9bM0oq7oKSqmHBvvD8llTAzKmUH5H8dB56hVrdnPF3zYC?=
 =?us-ascii?Q?pnTOH+sIpOywF+w0c+Ju3vXfQbTgXmK2aTbCEdMgZCx6/Nvrqnz9cmR7wQSC?=
 =?us-ascii?Q?JWAm7tfOVKVTev6iHNP0cbgGRB05+OAUJWTnM4cR9VNxUVGn+9dUhsOe9Afg?=
 =?us-ascii?Q?Vv2trLQEuae4L4SmBk7hh0HuCvP3O/iB27gCivTajLDD311P8HT5MSx7X0z1?=
 =?us-ascii?Q?UO42cI7v5QShZXu+BKroQY3Mu60avxUJw0m/o41v7HtLCZUGvj/bftzVEzXu?=
 =?us-ascii?Q?FKpUDztmr1Fp5ZpdsxEIzQHYOgoZsIgUTezp/mKieTIXC3o/32K+mXwH99T2?=
 =?us-ascii?Q?YR6Ec50c91VzC1M4kVPB3oriaIctAhmNs8ixETs8tB+ebgeWBPv9rWL5qt1Q?=
 =?us-ascii?Q?JvLqlOmzl0vziq1OaOaVgEWyadey+DNWkY53fmgrW5Ofc7TyUsCcdM0BS2Vc?=
 =?us-ascii?Q?8Fcxlg2k5w1+SUxtIvrSK+xBwc5iSTKI7T3cAp1FfSsKLeFMzxuouc7HGY28?=
 =?us-ascii?Q?XjgPS73qZUsdA7NGs8aTwSN7MhIRXB1ZIpBQ0kc86myxB3nFysugxQVFOBVx?=
 =?us-ascii?Q?TZOablaredXFXqF7WTrJfpmJGxJhnA8JF+E4FmJNSOcBbSYyiOb63g4OJzy3?=
 =?us-ascii?Q?jKN/auP4+Ecbcw7FV7bc1WKNs7TC+cx7mWMqM+5N9AC2bgVx26qVU0KkxZAf?=
 =?us-ascii?Q?gDN15zAu0djwKWvtlaFaZ695PrczIXvVa1KoAcG2UhZ6wxrN25x4hZj29FV9?=
 =?us-ascii?Q?qrztkVGGcICw0omdrG7ncQx5hDBDibEWn+FpociIi6suOP8qAs6N8brd30i9?=
 =?us-ascii?Q?hst5jtPP6d10B8Lv87Llb7f4lTh8/6zfPQtuGmI+GWt7S+wQtbBSjmC+kLRq?=
 =?us-ascii?Q?3gRtmeMqkPT+aUdyE9LvsJhggygF6UibZm1QkiHSmHyfwsNzKFh5efYk7Khu?=
 =?us-ascii?Q?fphDHE4VavpuN5auy2Vkevm3j0HDrb3PPtjrWPAj?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c52bbdab-a262-49ce-f370-08db7d5e5c64
X-MS-Exchange-CrossTenant-AuthSource: PS1PR0601MB3737.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2023 13:47:23.6192
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: lL5DuocRT/I9RhpJKP3J60ZrzpH6SdVDnnP8rycAGyVqVdMGEHpoOn+wX9p1FoleHTGcBO2HLGuE6B3qyU44bA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB6467
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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 <machel@vivo.com>
---
 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