Skip to contentSkip to conversation

i2c: i801: unregister tco_pdev in i801_probe() error path

PATCH Applied Heiner Kallweit 4 participants 4 messages Sep 14, 2023 – Sep 19, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i2c: i801: unregister tco_pdev in i801_probe() error path

We have to unregister tco_pdev also if i2c_add_adapter() fails.

Fixes 9424693035a5 ("i2c: i801: Create iTCO device on newer Intel PCHs")
---
 drivers/i2c/busses/i2c-i801.c | 1 +
 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-i801.c +1 -0
index f53be242f..9bd712eaf 100644
@@ -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;
 	}
Signature · 1 line
2.42.0
Reviewed-by on v1 1/1
#2 lore raw
In reply to Heiner Kallweit
Quoted 14 lines · Heiner Kallweit

We have to unregister tco_pdev also if i2c_add_adapter() fails.

Fixes 9424693035a5 ("i2c: i801: Create iTCO device on newer Intel PCHs")
---
 drivers/i2c/busses/i2c-i801.c | 1 +
 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-i801.c +0 -0
index f53be242f..9bd712eaf 100644

drivers/i2c/busses/i2c-i801.c static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id) · line 1759

Quoted 7 lines
drivers/i2c/busses/i2c-i801.c +1 -0
@@ -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;
 	}
Signature · 2 lines
Jean Delvare
SUSE L3 Support