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 A3F3DE7C4E9 for ; Wed, 4 Oct 2023 18:09:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233144AbjJDSJY (ORCPT ); Wed, 4 Oct 2023 14:09:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243875AbjJDSJM (ORCPT ); Wed, 4 Oct 2023 14:09:12 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8950AD for ; Wed, 4 Oct 2023 11:09:07 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE708C433CA; Wed, 4 Oct 2023 18:09:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1696442947; bh=9/ccnkcjSSbRoRTyIDD+dK7h2hDx5FUzcGp1G4JqJUc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p+m2KHM3y4PSTbOnj2jY+qbWw75c+KmweBQ+rQL+eKQMRU0Cwp4wAvd11u09sy479 wkS06nlalZLHpQ74MgCocXv0IrGw3vNDy9C0HyqM1GD46U+qgw35U0LZiKidLX33Lc CU35wsDt1Z+Rk5AKuoHxUHcotrjRocHo/TugLHOs= 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.15 166/183] i2c: i801: unregister tco_pdev in i801_probe() error path Date: Wed, 4 Oct 2023 19:56:37 +0200 Message-ID: <20231004175210.987683731@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231004175203.943277832@linuxfoundation.org> References: <20231004175203.943277832@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: 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 @@ -1861,6 +1861,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; }