From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 313B3E95A91 for ; Mon, 9 Oct 2023 13:27:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376778AbjJIN1f (ORCPT ); Mon, 9 Oct 2023 09:27:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376791AbjJIN1e (ORCPT ); Mon, 9 Oct 2023 09:27:34 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98A9594 for ; Mon, 9 Oct 2023 06:27:32 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8ECEC433C8; Mon, 9 Oct 2023 13:27:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1696858052; bh=+QHkD19/qvA/zkRbupONG2r3g67gkOvQZotRX8KjZ3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=In9VJLvswC37WAD/9ppHNtKmxodAyjqS7jkdALMsbdce7YCmE5YmQXPF3i7DcJ6qu 4rqI0wCoL7ikNh7zzhs2j0/6kR8EpbHSaRgNETVyUwfk19Jh3hiNg+LxEFFIx0Yyby qNHSl4qIaRceUZRouoyIPhO9ImZs9rtb3YW8qULU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, kernel test robot , Jiri Kosina , Sasha Levin Subject: [PATCH 5.15 61/75] HID: sony: remove duplicate NULL check before calling usb_free_urb() Date: Mon, 9 Oct 2023 15:02:23 +0200 Message-ID: <20231009130113.395538727@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231009130111.200710898@linuxfoundation.org> References: <20231009130111.200710898@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiri Kosina [ Upstream commit b328dd02e19cb9d3b35de4322f5363516a20ac8c ] usb_free_urb() does the NULL check itself, so there is no need to duplicate it prior to calling. Reported-by: kernel test robot Fixes: e1cd4004cde7c9 ("HID: sony: Fix a potential memory leak in sony_probe()") Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/hid-sony.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index 3ab18811b0090..c330d5a20ca04 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c @@ -3074,8 +3074,7 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id) return ret; err: - if (sc->ghl_urb) - usb_free_urb(sc->ghl_urb); + usb_free_urb(sc->ghl_urb); hid_hw_stop(hdev); return ret; -- 2.40.1