]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: cs42l43: Correct extraction of data pointer in suspend/resume
authorCharles Keepax <ckeepax@opensource.cirrus.com>
Tue, 26 Mar 2024 10:54:34 +0000 (10:54 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 10 Apr 2024 14:38:09 +0000 (16:38 +0200)
[ Upstream commit 56ebbd19c2989f7450341f581e2724a149d0f08e ]

The current code is pulling the wrong pointer causing it to disable the
wrong IRQ. Correct the code to pull the correct cs42l43 core data
pointer.

Fixes: 64353af49fec ("ASoC: cs42l43: Add system suspend ops to disable IRQ")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://msgid.link/r/20240326105434.852907-1-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/codecs/cs42l43.c

index a97ccb512deba86305ff433fa5b639fdfbb8dcbe..a24b52c9dda6b45de77cb673a554676750681161 100644 (file)
@@ -2338,7 +2338,8 @@ static int cs42l43_codec_runtime_resume(struct device *dev)
 
 static int cs42l43_codec_suspend(struct device *dev)
 {
-       struct cs42l43 *cs42l43 = dev_get_drvdata(dev);
+       struct cs42l43_codec *priv = dev_get_drvdata(dev);
+       struct cs42l43 *cs42l43 = priv->core;
 
        disable_irq(cs42l43->irq);
 
@@ -2347,7 +2348,8 @@ static int cs42l43_codec_suspend(struct device *dev)
 
 static int cs42l43_codec_suspend_noirq(struct device *dev)
 {
-       struct cs42l43 *cs42l43 = dev_get_drvdata(dev);
+       struct cs42l43_codec *priv = dev_get_drvdata(dev);
+       struct cs42l43 *cs42l43 = priv->core;
 
        enable_irq(cs42l43->irq);
 
@@ -2356,7 +2358,8 @@ static int cs42l43_codec_suspend_noirq(struct device *dev)
 
 static int cs42l43_codec_resume(struct device *dev)
 {
-       struct cs42l43 *cs42l43 = dev_get_drvdata(dev);
+       struct cs42l43_codec *priv = dev_get_drvdata(dev);
+       struct cs42l43 *cs42l43 = priv->core;
 
        enable_irq(cs42l43->irq);
 
@@ -2365,7 +2368,8 @@ static int cs42l43_codec_resume(struct device *dev)
 
 static int cs42l43_codec_resume_noirq(struct device *dev)
 {
-       struct cs42l43 *cs42l43 = dev_get_drvdata(dev);
+       struct cs42l43_codec *priv = dev_get_drvdata(dev);
+       struct cs42l43 *cs42l43 = priv->core;
 
        disable_irq(cs42l43->irq);