]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: nau8821: Don't unconditionally free interrupt
authorMark Brown <broonie@kernel.org>
Mon, 18 Jul 2022 14:04:05 +0000 (15:04 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Aug 2022 09:45:50 +0000 (11:45 +0200)
[ Upstream commit 2d86cef353b8f3d20b16f8c5615742fd6938c801 ]

The remove() operation unconditionally frees the interrupt for the device
but we may not actually have an interrupt so there might be nothing to
free. Since the interrupt is requested after all other resources we don't
need the explicit free anyway, unwinding is guaranteed to be safe, so just
delete the remove() function and let devm take care of things.

Reported-by: Zheyu Ma <zheyuma97@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Tested-by: Zheyu Ma <zheyuma97@gmail.com>
Link: https://lore.kernel.org/r/20220718140405.57233-1-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/codecs/nau8821.c

index ce4e7f46bb067fde13385086fd4fa5ca2f1d38ea..e078d2ffb3f67e553bf786a7b6aed209da7de6a8 100644 (file)
@@ -1665,15 +1665,6 @@ static int nau8821_i2c_probe(struct i2c_client *i2c)
        return ret;
 }
 
-static int nau8821_i2c_remove(struct i2c_client *i2c_client)
-{
-       struct nau8821 *nau8821 = i2c_get_clientdata(i2c_client);
-
-       devm_free_irq(nau8821->dev, nau8821->irq, nau8821);
-
-       return 0;
-}
-
 static const struct i2c_device_id nau8821_i2c_ids[] = {
        { "nau8821", 0 },
        { }
@@ -1703,7 +1694,6 @@ static struct i2c_driver nau8821_driver = {
                .acpi_match_table = ACPI_PTR(nau8821_acpi_match),
        },
        .probe_new = nau8821_i2c_probe,
-       .remove = nau8821_i2c_remove,
        .id_table = nau8821_i2c_ids,
 };
 module_i2c_driver(nau8821_driver);