From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A818E36D9EA; Wed, 20 May 2026 17:44:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779299078; cv=none; b=FmV7D03sq/wH9NOmDoJovAHTX3yUL34+b5TQXZ3hCRWM9JYPTB4DQ8OMAHyEiVVlKNjQxRw12yDDK4Hb6+ECDqEx0kgmvLYC08xDTpVwe5j49Vo8tBtxEapUsOduMK4m2dkQ87PLo0Ps4apV5yAaxooT1CsEcxJJqZtEo/uUG0Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779299078; c=relaxed/simple; bh=c4TlCxO4TzDTD8baFMg8FZufmInLzbB+ue7kTLRmpoM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tMMQQfVgdTdI4wzLbKfnMsqIQKy9H8jp1aoT1IgSw83sklOZxbJdJpjyH7GU47vOwAbLCswAkr4li/G5ABFo/Dlhbuki2asxy+6UV/Nv0kyIvKoIm1sCGpT1kEmLzfgHcOW9Cxnr3WuI1J3uAlKbwFu1al0gnRJdjtY7co5Y9JE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WEHMDwgB; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="WEHMDwgB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19D021F000E9; Wed, 20 May 2026 17:44:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779299077; bh=mnNMu3pVoI7xw6N8Le/Ccx9fY1JdfVkDqPCiVTHl5BM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WEHMDwgBjnYcBjiBaUV13icXiw9/iRaJ87u8lLQBJPhgbYKcH8wKRM2HIpg/a0RIE 5UIbWFzSQ0ijknGRsnaS4pRagGcdgBhI0dxtKaqrKkjGoE9qxZGHUh4tCNvWUakfk8 MvnhkXASHf+caAuC2znT1CXJVKFGm+97RcgfMumg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Matt Vollrath , Avigail Dahan , Jacob Keller , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18 653/957] e1000e: Unroll PTP in probe error handling Date: Wed, 20 May 2026 18:18:56 +0200 Message-ID: <20260520162148.694058821@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162134.554764788@linuxfoundation.org> References: <20260520162134.554764788@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Matt Vollrath [ Upstream commit aa3f7fe409350857c25d050482a2eef2cfd69b58 ] If probe fails after registering the PTP clock and its delayed work, these resources must be released. This was not an issue until a 2016 fix moved the e1000e_ptp_init() call before the jump to err_register. Fixes: aa524b66c5ef ("e1000e: don't modify SYSTIM registers during SIOCSHWTSTAMP ioctl") Signed-off-by: Matt Vollrath Tested-by: Avigail Dahan Signed-off-by: Jacob Keller Link: https://patch.msgid.link/20260416-iwl-net-submission-2026-04-14-v2-12-686c33c9828d@intel.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/e1000e/netdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 3e39032696100..833b2e7a86d8c 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -7705,6 +7705,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err_register: if (!(adapter->flags & FLAG_HAS_AMT)) e1000e_release_hw_control(adapter); + e1000e_ptp_remove(adapter); err_eeprom: if (hw->phy.ops.check_reset_block && !hw->phy.ops.check_reset_block(hw)) e1000_phy_hw_reset(&adapter->hw); -- 2.53.0