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 102E7263F44; Sat, 30 May 2026 17:21:25 +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=1780161685; cv=none; b=mnvvYBUNDj0piHKaO9qJVmoIPNCy9qHh588RsM7tpAAd+YkQwQIZbldXPsDe/vBWVBiHpq5vPk/uO65Do5MDvq8W/2ojBc+Hix0ZNMwSekC72gz0O86hUsJb9E9ECuHvUkpGyXb9auMA3Nsbq9bKY3fn/Ki9kDxg12uTUUIPBZ8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780161685; c=relaxed/simple; bh=qA91nQrTtSoIO0hUDAT/yX2QvXlBnwRdL1yN/gFlMKU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZjuL927tu+4D6Q2HNipT9hfn/19Yy1/bpW6HHMVq5DDsCzEaE7F600ssHyRwdftKX0CM6N5wlUjn4fOrYElcfQCYr8YY/5UdhL/e5Qmqvp7Eg0v5X/VvA7UQc4IqRjR4jz+nwoUNNHm7FvDw9b6b2ktA/syXBbvT2qmlbY4H+J8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=x7Q8WQPa; 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="x7Q8WQPa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 56A641F00893; Sat, 30 May 2026 17:21:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780161685; bh=b2Oco53f7/o0wMngOda0FjRTFYKTZ+icOfOpkVYHut8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=x7Q8WQPaswbIQhcu7SIHeKSMOxmDH/MYEI/XE9JueA7yRcFwKFxQ/QeJky4noKo7d sPzqTEUB8wg4clYuQDinBSpZ3B++bIbUwqKf0WqPrEpz2p50aWvXML7UR7iJLJu/hT TajHtsmXKi3OAwlvHPFJak48e8Xl0E15Vt8ZgQlo= 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.1 695/969] e1000e: Unroll PTP in probe error handling Date: Sat, 30 May 2026 18:03:39 +0200 Message-ID: <20260530160319.706735148@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@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.1-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 fd056c17bd62e..f16668f47165b 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -7695,6 +7695,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