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 E06A6E95A96 for ; Mon, 9 Oct 2023 13:44:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377264AbjJINoX (ORCPT ); Mon, 9 Oct 2023 09:44:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377473AbjJINoA (ORCPT ); Mon, 9 Oct 2023 09:44:00 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FACDCA for ; Mon, 9 Oct 2023 06:43:59 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1B16C433C8; Mon, 9 Oct 2023 13:43:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1696859039; bh=69D7eTa8OR5A9MUu++p2AXIXjjyMbll0YvliUEKhWKY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZJ9rMjdAM6nCEMv9QOJ5DCERALM3pAZd23uAr2S13CcI4lBLpT/vNt8GSR4mIPZ1f MWrXPWvAfggAnmM4Zn7FvxZbN3shZTMYzi2WUfwjeiCS+q26XLopTM+TfG0027Feiv Q+/3vsqp8s8/qX6WFLeYVJ8jSrsgUJx2HaLVMWvM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Heiner Kallweit , Mika Westerberg , Jean Delvare , Wolfram Sang Subject: [PATCH 5.10 151/226] i2c: i801: unregister tco_pdev in i801_probe() error path Date: Mon, 9 Oct 2023 15:01:52 +0200 Message-ID: <20231009130130.654396381@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231009130126.697995596@linuxfoundation.org> References: <20231009130126.697995596@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.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Heiner Kallweit commit 3914784553f68c931fc666dbe7e86fe881aada38 upstream. We have to unregister tco_pdev also if i2c_add_adapter() fails. Fixes: 9424693035a5 ("i2c: i801: Create iTCO device on newer Intel PCHs") Cc: stable@vger.kernel.org Signed-off-by: Heiner Kallweit Reviewed-by: Mika Westerberg Reviewed-by: Jean Delvare Signed-off-by: Wolfram Sang Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/busses/i2c-i801.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c @@ -1907,6 +1907,7 @@ static int i801_probe(struct pci_dev *de "SMBus I801 adapter at %04lx", priv->smba); err = i2c_add_adapter(&priv->adapter); if (err) { + platform_device_unregister(priv->tco_pdev); i801_acpi_remove(priv); return err; }