public inbox for linux-i2c@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] i2c: i801: unregister tco_pdev in i801_probe() error path
@ 2023-09-14 21:08 Heiner Kallweit
  2023-09-15  4:55 ` Mika Westerberg
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Heiner Kallweit @ 2023-09-14 21:08 UTC (permalink / raw)
  To: Jean Delvare, Andi Shyti
  Cc: linux-i2c@vger.kernel.org, Mika Westerberg, Matt Fleming,
	Guenter Roeck, Wolfram Sang, Lee Jones

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 <hkallweit1@gmail.com>
---
 drivers/i2c/busses/i2c-i801.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index f53be242f..9bd712eaf 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -1753,6 +1753,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
 		"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;
 	}
-- 
2.42.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] i2c: i801: unregister tco_pdev in i801_probe() error path
  2023-09-14 21:08 [PATCH] i2c: i801: unregister tco_pdev in i801_probe() error path Heiner Kallweit
@ 2023-09-15  4:55 ` Mika Westerberg
  2023-09-17 17:33 ` Jean Delvare
  2023-09-19  9:03 ` Wolfram Sang
  2 siblings, 0 replies; 4+ messages in thread
From: Mika Westerberg @ 2023-09-15  4:55 UTC (permalink / raw)
  To: Heiner Kallweit
  Cc: Jean Delvare, Andi Shyti, linux-i2c@vger.kernel.org, Matt Fleming,
	Guenter Roeck, Wolfram Sang, Lee Jones

On Thu, Sep 14, 2023 at 11:08:44PM +0200, Heiner Kallweit wrote:
> 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 <hkallweit1@gmail.com>

Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] i2c: i801: unregister tco_pdev in i801_probe() error path
  2023-09-14 21:08 [PATCH] i2c: i801: unregister tco_pdev in i801_probe() error path Heiner Kallweit
  2023-09-15  4:55 ` Mika Westerberg
@ 2023-09-17 17:33 ` Jean Delvare
  2023-09-19  9:03 ` Wolfram Sang
  2 siblings, 0 replies; 4+ messages in thread
From: Jean Delvare @ 2023-09-17 17:33 UTC (permalink / raw)
  To: Heiner Kallweit
  Cc: Andi Shyti, linux-i2c, Mika Westerberg, Matt Fleming,
	Guenter Roeck, Wolfram Sang, Lee Jones

On Thu, 14 Sep 2023 23:08:44 +0200, Heiner Kallweit wrote:
> 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 <hkallweit1@gmail.com>
> ---
>  drivers/i2c/busses/i2c-i801.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
> index f53be242f..9bd712eaf 100644
> --- a/drivers/i2c/busses/i2c-i801.c
> +++ b/drivers/i2c/busses/i2c-i801.c
> @@ -1753,6 +1753,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
>  		"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;
>  	}

Reviewed-by: Jean Delvare <jdelvare@suse.de>

-- 
Jean Delvare
SUSE L3 Support

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] i2c: i801: unregister tco_pdev in i801_probe() error path
  2023-09-14 21:08 [PATCH] i2c: i801: unregister tco_pdev in i801_probe() error path Heiner Kallweit
  2023-09-15  4:55 ` Mika Westerberg
  2023-09-17 17:33 ` Jean Delvare
@ 2023-09-19  9:03 ` Wolfram Sang
  2 siblings, 0 replies; 4+ messages in thread
From: Wolfram Sang @ 2023-09-19  9:03 UTC (permalink / raw)
  To: Heiner Kallweit
  Cc: Jean Delvare, Andi Shyti, linux-i2c@vger.kernel.org,
	Mika Westerberg, Matt Fleming, Guenter Roeck, Lee Jones

[-- Attachment #1: Type: text/plain, Size: 338 bytes --]

On Thu, Sep 14, 2023 at 11:08:44PM +0200, Heiner Kallweit wrote:
> 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 <hkallweit1@gmail.com>

Applied to for-current, thanks!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-09-19  9:03 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-14 21:08 [PATCH] i2c: i801: unregister tco_pdev in i801_probe() error path Heiner Kallweit
2023-09-15  4:55 ` Mika Westerberg
2023-09-17 17:33 ` Jean Delvare
2023-09-19  9:03 ` Wolfram Sang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox