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

If i2c_add_adapter() fails, the request_region() call in ali15x3_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/9b2090cbcc02659f425188ea05f2e02745c4e67b.1741031878.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/i2c/busses/i2c-ali15x3.c

index cc58feacd08212b792d486f4d455a764d6e9bb81..28a57cb6efb99b3c9f90fc415e09e2f19af37369 100644 (file)
@@ -473,6 +473,8 @@ MODULE_DEVICE_TABLE (pci, ali15x3_ids);
 
 static int ali15x3_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
+       int ret;
+
        if (ali15x3_setup(dev)) {
                dev_err(&dev->dev,
                        "ALI15X3 not detected, module not inserted.\n");
@@ -484,7 +486,15 @@ static int ali15x3_probe(struct pci_dev *dev, const struct pci_device_id *id)
 
        snprintf(ali15x3_adapter.name, sizeof(ali15x3_adapter.name),
                "SMBus ALI15X3 adapter at %04x", ali15x3_smba);
-       return i2c_add_adapter(&ali15x3_adapter);
+       ret = i2c_add_adapter(&ali15x3_adapter);
+       if (ret)
+               goto release_region;
+
+       return 0;
+
+release_region:
+       release_region(ali15x3_smba, ALI15X3_SMB_IOSIZE);
+       return ret;
 }
 
 static void ali15x3_remove(struct pci_dev *dev)