]> git.ipfire.org Git - thirdparty/linux.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)
committerMark Brown <broonie@kernel.org>
Tue, 19 Jul 2022 13:54:26 +0000 (14:54 +0100)
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>
sound/soc/codecs/nau8821.c

index 83a17c48d594e3ea8c6315aa9118b426429d026f..2d21339932e651bdf24bf3b6a6ebf6bef5bfde40 100644 (file)
@@ -1729,15 +1729,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 },
        { }
@@ -1767,7 +1758,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);