]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
i2c: ali1535: Fix an error handling path in ali1535_probe()
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Mon, 3 Mar 2025 19:53:08 +0000 (20:53 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Apr 2025 12:30:51 +0000 (14:30 +0200)
[ Upstream commit 9b5463f349d019a261f1e80803447efca3126151 ]

If i2c_add_adapter() fails, the request_region() call in ali1535_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 <christophe.jaillet@wanadoo.fr>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/0daf63d7a2ce74c02e2664ba805bbfadab7d25e5.1741031571.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/i2c/busses/i2c-ali1535.c

index fb93152845f433bc1c015002320bf71991aa8fa6..b36b75fc5b089f96c9b06417b319348f1245ad4e 100644 (file)
@@ -490,6 +490,8 @@ MODULE_DEVICE_TABLE(pci, ali1535_ids);
 
 static int ali1535_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
+       int ret;
+
        if (ali1535_setup(dev)) {
                dev_warn(&dev->dev,
                        "ALI1535 not detected, module not inserted.\n");
@@ -501,7 +503,15 @@ static int ali1535_probe(struct pci_dev *dev, const struct pci_device_id *id)
 
        snprintf(ali1535_adapter.name, sizeof(ali1535_adapter.name),
                "SMBus ALI1535 adapter at %04x", ali1535_offset);
-       return i2c_add_adapter(&ali1535_adapter);
+       ret = i2c_add_adapter(&ali1535_adapter);
+       if (ret)
+               goto release_region;
+
+       return 0;
+
+release_region:
+       release_region(ali1535_smba, ALI1535_SMB_IOSIZE);
+       return ret;
 }
 
 static void ali1535_remove(struct pci_dev *dev)