Skip to content

Commit 5f51de7

Browse files
soyersoyertiwai
authored andcommitted
ALSA: hda/tas2781: do not call pm_runtime_force_* in system_resume/suspend
The runtime_resume function calls prmg_load and apply_calibration functions, but system_resume also calls them, so calling pm_runtime_force_resume before reset is unnecessary. For consistency, do not call the pm_runtime_force_suspend in system_suspend, as runtime_suspend does the same. Fixes: 5be27f1 ("ALSA: hda/tas2781: Add tas2781 HDA driver") Signed-off-by: Gergo Koteles <soyer@irl.hu> Signed-off-by: Takashi Iwai <tiwai@suse.de> Message-ID: <d0b4cc1248b9d375d59c009563da42d60d69eac3.1709918447.git.soyer@irl.hu>
1 parent bec7760 commit 5f51de7

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

sound/pci/hda/tas2781_hda_i2c.c

+1-10
Original file line numberDiff line numberDiff line change
@@ -870,14 +870,9 @@ static int tas2781_runtime_resume(struct device *dev)
870870
static int tas2781_system_suspend(struct device *dev)
871871
{
872872
struct tas2781_hda *tas_hda = dev_get_drvdata(dev);
873-
int ret;
874873

875874
dev_dbg(tas_hda->priv->dev, "System Suspend\n");
876875

877-
ret = pm_runtime_force_suspend(dev);
878-
if (ret)
879-
return ret;
880-
881876
mutex_lock(&tas_hda->priv->codec_lock);
882877

883878
/* Shutdown chip before system suspend */
@@ -895,14 +890,10 @@ static int tas2781_system_suspend(struct device *dev)
895890
static int tas2781_system_resume(struct device *dev)
896891
{
897892
struct tas2781_hda *tas_hda = dev_get_drvdata(dev);
898-
int i, ret;
893+
int i;
899894

900895
dev_dbg(tas_hda->priv->dev, "System Resume\n");
901896

902-
ret = pm_runtime_force_resume(dev);
903-
if (ret)
904-
return ret;
905-
906897
mutex_lock(&tas_hda->priv->codec_lock);
907898

908899
for (i = 0; i < tas_hda->priv->ndev; i++) {

0 commit comments

Comments
 (0)