summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-06-18 07:55:02 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-25 14:07:24 -0700
commit1d33b1e178d4d298150227227e079dd883f06f57 (patch)
tree614c1e993542533a64abdb87ffbe1c644ec59a6e
parentc38217e1b806155493c9324345f0f1e6561e55db (diff)
downloadlinux-3.10-1d33b1e178d4d298150227227e079dd883f06f57.tar.gz
linux-3.10-1d33b1e178d4d298150227227e079dd883f06f57.tar.bz2
linux-3.10-1d33b1e178d4d298150227227e079dd883f06f57.zip
ALSA: hda - Fix return value of snd_hda_check_power_state()
commit 06ec56d3c60238f27bfa50d245592fccc1b4ef0f upstream. The refactoring by commit 9040d102 introduced the new function snd_hda_check_power_state(). This function is supposed to return true if the state already reached to the target state, but it actually returns false for that. An utterly stupid typo while copy & paste. Fortunately this didn't influence on much behavior because powering up AFG usually powers up the child widgets, too. But the finer power control must have been broken by this bug. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--sound/pci/hda/hda_local.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index e0bf7534fa1..29ed7d9b27e 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -667,7 +667,7 @@ snd_hda_check_power_state(struct hda_codec *codec, hda_nid_t nid,
if (state & AC_PWRST_ERROR)
return true;
state = (state >> 4) & 0x0f;
- return (state != target_state);
+ return (state == target_state);
}
unsigned int snd_hda_codec_eapd_power_filter(struct hda_codec *codec,