ASoC: cs35l56: Rework IRQ allocation

The irq member was being set before calling the init function and then
cs35l56_irq_request() was called only when the init was successful.
However cs35l56_release() calls devm_free_irq() when the irq member is
set and therefore if init() fails then this will cause an attempted free
of an unallocated IRQ.

Instead pass the desired IRQ number to the cs35l56_irq_request()
function and set cs35l56->irq only when it has been successfully
allocated.

Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/168147949598.26.711670799488943454@mailman-core.alsa-project.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs35l56-i2c.c b/sound/soc/codecs/cs35l56-i2c.c
index 4b7f034a7670b29906ecd9eb518ed0e93f298345..295caad26224302f41b663f16d2c23e8a0831daa 100644 (file)
--- a/sound/soc/codecs/cs35l56-i2c.c
+++ b/sound/soc/codecs/cs35l56-i2c.c
@@ -27,7 +27,6 @@ static int cs35l56_i2c_probe(struct i2c_client *client)
                return -ENOMEM;
 
        cs35l56->dev = dev;
-       cs35l56->irq = client->irq;
        cs35l56->can_hibernate = true;
 
        i2c_set_clientdata(client, cs35l56);
@@ -43,7 +42,7 @@ static int cs35l56_i2c_probe(struct i2c_client *client)
 
        ret = cs35l56_init(cs35l56);
        if (ret == 0)
-               ret = cs35l56_irq_request(cs35l56);
+               ret = cs35l56_irq_request(cs35l56, client->irq);
        if (ret < 0)
                cs35l56_remove(cs35l56);
 

diff --git a/sound/soc/codecs/cs35l56-spi.c b/sound/soc/codecs/cs35l56-spi.c
index 4b2084e85f29274802f6e3959f6158ccc7f58330..996aab10500eeb9894633076d8b9d998d4eae75a 100644 (file)
--- a/sound/soc/codecs/cs35l56-spi.c
+++ b/sound/soc/codecs/cs35l56-spi.c
@@ -32,7 +32,6 @@ static int cs35l56_spi_probe(struct spi_device *spi)
        }
 
        cs35l56->dev = &spi->dev;
-       cs35l56->irq = spi->irq;
 
        ret = cs35l56_common_probe(cs35l56);
        if (ret != 0)
@@ -40,7 +39,7 @@ static int cs35l56_spi_probe(struct spi_device *spi)
 
        ret = cs35l56_init(cs35l56);
        if (ret == 0)
-               ret = cs35l56_irq_request(cs35l56);
+               ret = cs35l56_irq_request(cs35l56, spi->irq);
        if (ret < 0)
                cs35l56_remove(cs35l56);
 

diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c
index 18e3417448392bb71124022797916c38bc498947..5ea7f419cda6ab4cf1d702ab0a1276b12109180f 100644 (file)
--- a/sound/soc/codecs/cs35l56.c
+++ b/sound/soc/codecs/cs35l56.c
@@ -423,18 +423,19 @@ err_unlock:
 }
 EXPORT_SYMBOL_NS_GPL(cs35l56_irq, SND_SOC_CS35L56_CORE);
 
-int cs35l56_irq_request(struct cs35l56_private *cs35l56)
+int cs35l56_irq_request(struct cs35l56_private *cs35l56, int irq)
 {
        int ret;
 
-       if (!cs35l56->irq)
+       if (!irq)
                return 0;
 
-       ret = devm_request_threaded_irq(cs35l56->dev, cs35l56->irq, NULL,
-                                       cs35l56_irq,
+       ret = devm_request_threaded_irq(cs35l56->dev, irq, NULL, cs35l56_irq,
                                        IRQF_ONESHOT | IRQF_SHARED | IRQF_TRIGGER_LOW,
                                        "cs35l56", cs35l56);
-       if (ret < 0)
+       if (!ret)
+               cs35l56->irq = irq;
+       else
                dev_err(cs35l56->dev, "Failed to get IRQ: %d\n", ret);
 
        return ret;

diff --git a/sound/soc/codecs/cs35l56.h b/sound/soc/codecs/cs35l56.h
index 50278dafc9ca80a9b9ac4f5d21fa51aa70c1e704..ac2e9237c27d30a82f60e289f35b6f029a53d293 100644 (file)
--- a/sound/soc/codecs/cs35l56.h
+++ b/sound/soc/codecs/cs35l56.h
@@ -74,7 +74,7 @@ int cs35l56_system_resume_no_irq(struct device *dev);
 int cs35l56_system_resume_early(struct device *dev);
 int cs35l56_system_resume(struct device *dev);
 irqreturn_t cs35l56_irq(int irq, void *data);
-int cs35l56_irq_request(struct cs35l56_private *cs35l56);
+int cs35l56_irq_request(struct cs35l56_private *cs35l56, int irq);
 int cs35l56_common_probe(struct cs35l56_private *cs35l56);
 int cs35l56_init(struct cs35l56_private *cs35l56);
 int cs35l56_remove(struct cs35l56_private *cs35l56);