Skip to content

Commit 5673654

Browse files
crojewsk-intelbroonie
authored andcommitted
ASoC: Intel: catpt: Do not block the system from suspending
Even if something goes wrong when performing suspend on DSP, from the system perspective the component is not critical enough to block the suspend operation entirely. Leaving recovery to next resume() suffices. Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> Link: https://patch.msgid.link/20251126095523.3925364-7-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 8a342b2 commit 5673654

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

sound/soc/intel/catpt/device.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#define CREATE_TRACE_POINTS
2929
#include "trace.h"
3030

31-
static int catpt_suspend(struct device *dev)
31+
static int catpt_do_suspend(struct device *dev)
3232
{
3333
struct catpt_dev *cdev = dev_get_drvdata(dev);
3434
struct dma_chan *chan;
@@ -72,6 +72,13 @@ static int catpt_suspend(struct device *dev)
7272
return catpt_dsp_power_down(cdev);
7373
}
7474

75+
/* Do not block the system from suspending, recover on resume() if needed. */
76+
static int catpt_suspend(struct device *dev)
77+
{
78+
catpt_do_suspend(dev);
79+
return 0;
80+
}
81+
7582
static int catpt_resume(struct device *dev)
7683
{
7784
struct catpt_dev *cdev = dev_get_drvdata(dev);
@@ -114,7 +121,7 @@ static int catpt_runtime_suspend(struct device *dev)
114121
}
115122
module_put(dev->driver->owner);
116123

117-
return catpt_suspend(dev);
124+
return catpt_do_suspend(dev);
118125
}
119126

120127
static int catpt_runtime_resume(struct device *dev)

0 commit comments

Comments
 (0)