ALSA: hda - Check keep_eapd_on before inv_eapd
authorTakashi Iwai <tiwai@suse.de>
Tue, 12 Nov 2013 10:36:00 +0000 (11:36 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 29 Nov 2013 19:11:46 +0000 (11:11 -0800)
commit320f9078dbc4f9f71c79084d77cfe4c03aaaf328
treead7e8ca7620c8f5261dcc3b28a6764809ffe8a7c
parentc6ebcc4a440d9d8243ce33ed6c95235125fe1a80
ALSA: hda - Check keep_eapd_on before inv_eapd

commit 468ac413045af1e0e4d1272291bed6878f248a69 upstream.

We don't change the EAPD bit in set_pin_eapd() if keep_eapd_on flag is
set by the codec driver and enable is false.  But, we also apply the
flipping of enable value according to inv_eapd flag in the same
function, and this confused the former check, handled as if it's
turned ON.  The inverted EAPD check must be applied after keep_eapd_on
check, instead.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/pci/hda/hda_generic.c