From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 99A0820C000; Wed, 19 Mar 2025 14:41:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742395268; cv=none; b=doG5vI8N4Z7D4c2yPPijmEMSqU+JNyU4O7M5msQMdF8pxl8bL0jFRLj3KLv4oU7lYaS/JuJs665EMe80x02h0xqOVFWd6zaBN4VBGOhavuBFyhXA9XQeERMoOtr9t+L9QDW2tU0owJqh5AVmvf9GMIJ6YkPl3IHfN3q6exNBi8g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742395268; c=relaxed/simple; bh=CMtL2A9+g0ysu72nZ7/6is5StiHyCsgCqBTGax5zz1E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jUobTBsiWrI9g2OeLukonJlMHcqZ6SyGOPVbA+Q4AQQG6gA0A3JLomxhGudNxiL2hsA6Abqq8hfQ/FCSG71RHxgI9u/lN/4bbRj3NpxFIyVCXlwWEjfJ4I9ttaO9B6RqR2fPKdaeUdMdLoXd7wfrJPA+QkRflIf/kwwum0qJp9k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wV7ulZoU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="wV7ulZoU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E538C4CEE8; Wed, 19 Mar 2025 14:41:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1742395268; bh=CMtL2A9+g0ysu72nZ7/6is5StiHyCsgCqBTGax5zz1E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wV7ulZoUU8tLDHxiVjCy2BiE9NNCG2R04YA8nCIuILjpqYqmACDHuIpoHqpL+om5T wN2yF00E547RSbmNT2Iz7mQtZYcj8wrFO1pLX2jUCfLpzIXAfRuo9vJPMEv2iVjylN Y1Wq/GKkJ/ryYzZ5Y0tz5iAs+kEjN75xkbPooXeQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christophe JAILLET , Andi Shyti , Sasha Levin Subject: [PATCH 6.6 155/166] i2c: sis630: Fix an error handling path in sis630_probe() Date: Wed, 19 Mar 2025 07:32:06 -0700 Message-ID: <20250319143024.229426900@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250319143019.983527953@linuxfoundation.org> References: <20250319143019.983527953@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christophe JAILLET [ Upstream commit 2b22459792fcb4def9f0936d64575ac11a95a58d ] If i2c_add_adapter() fails, the request_region() call in sis630_setup() must be undone by a corresponding release_region() call, as done in the remove function. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Christophe JAILLET Link: https://lore.kernel.org/r/3d607601f2c38e896b10207963c6ab499ca5c307.1741033587.git.christophe.jaillet@wanadoo.fr Signed-off-by: Andi Shyti Signed-off-by: Sasha Levin --- drivers/i2c/busses/i2c-sis630.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c index 87d56250d78a3..c42ecadac4f22 100644 --- a/drivers/i2c/busses/i2c-sis630.c +++ b/drivers/i2c/busses/i2c-sis630.c @@ -509,6 +509,8 @@ MODULE_DEVICE_TABLE(pci, sis630_ids); static int sis630_probe(struct pci_dev *dev, const struct pci_device_id *id) { + int ret; + if (sis630_setup(dev)) { dev_err(&dev->dev, "SIS630 compatible bus not detected, " @@ -522,7 +524,15 @@ static int sis630_probe(struct pci_dev *dev, const struct pci_device_id *id) snprintf(sis630_adapter.name, sizeof(sis630_adapter.name), "SMBus SIS630 adapter at %04x", smbus_base + SMB_STS); - return i2c_add_adapter(&sis630_adapter); + ret = i2c_add_adapter(&sis630_adapter); + if (ret) + goto release_region; + + return 0; + +release_region: + release_region(smbus_base + SMB_STS, SIS630_SMB_IOREGION); + return ret; } static void sis630_remove(struct pci_dev *dev) -- 2.39.5