Unverified Commit 8a342b2b authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: Intel: catpt: Do not ignore errors on runtime resume 



If pm_runtime_resume_and_get() fails, follow up pm_runtime_xxx()
operate on device in erroneous state.

Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://patch.msgid.link/20251126095523.3925364-6-cezary.rojewski@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 16e17736

sound/soc/intel/catpt/pcm.c

+6 −6
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ static int catpt_dai_pcm_new(struct snd_soc_pcm_runtime *rtm, 
		return 0;



	ret = pm_runtime_resume_and_get(cdev->dev);

	if (ret < 0 && ret != -EACCES)

	if (ret)

		return ret;



	ret = catpt_ipc_set_device_format(cdev, &devfmt);
@@ -874,7 +874,7 @@ static int catpt_mixer_volume_get(struct snd_kcontrol *kcontrol, 
	int i;



	ret = pm_runtime_resume_and_get(cdev->dev);

	if (ret < 0 && ret != -EACCES)

	if (ret)

		return ret;



	for (i = 0; i < CATPT_CHANNELS_MAX; i++) {
@@ -895,7 +895,7 @@ static int catpt_mixer_volume_put(struct snd_kcontrol *kcontrol, 
	int ret;



	ret = pm_runtime_resume_and_get(cdev->dev);

	if (ret < 0 && ret != -EACCES)

	if (ret)

		return ret;



	ret = catpt_set_dspvol(cdev, cdev->mixer.mixer_hw_id,
@@ -926,7 +926,7 @@ static int catpt_stream_volume_get(struct snd_kcontrol *kcontrol, 
	}



	ret = pm_runtime_resume_and_get(cdev->dev);

	if (ret < 0 && ret != -EACCES)

	if (ret)

		return ret;



	for (i = 0; i < CATPT_CHANNELS_MAX; i++) {
@@ -957,7 +957,7 @@ static int catpt_stream_volume_put(struct snd_kcontrol *kcontrol, 
	}



	ret = pm_runtime_resume_and_get(cdev->dev);

	if (ret < 0 && ret != -EACCES)

	if (ret)

		return ret;



	ret = catpt_set_dspvol(cdev, stream->info.stream_hw_id,
@@ -1033,7 +1033,7 @@ static int catpt_loopback_switch_put(struct snd_kcontrol *kcontrol, 
	}



	ret = pm_runtime_resume_and_get(cdev->dev);

	if (ret < 0 && ret != -EACCES)

	if (ret)

		return ret;



	ret = catpt_ipc_mute_loopback(cdev, stream->info.stream_hw_id, mute);

sound/soc/intel/catpt/sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ static ssize_t fw_version_show(struct device *dev, 
	int ret;



	ret = pm_runtime_resume_and_get(cdev->dev);

	if (ret < 0 && ret != -EACCES)

	if (ret)

		return ret;



	ret = catpt_ipc_get_fw_version(cdev, &version);