lkml.org 
[lkml]   [2013]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 40/40] Revert "ALSA: hda - hdmi: Make jacks phantom, if theyre not detectable"
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    This reverts commit 30efd8debd1ef30be342d374f01e993509f5b76b upstream
    (dd54ec4067a23236736afecbda120030d7ce8fe9 in this tree) as it is not
    needed for the 3.4-stable tree.

    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: David Henningsson <david.henningsson@canonical.com>
    Cc: Takashi Iwai <tiwai@suse.de>

    ---
    sound/pci/hda/patch_hdmi.c | 3 ---
    1 file changed, 3 deletions(-)

    --- a/sound/pci/hda/patch_hdmi.c
    +++ b/sound/pci/hda/patch_hdmi.c
    @@ -1244,9 +1244,6 @@ static int generic_hdmi_build_jack(struc

    if (pcmdev > 0)
    sprintf(hdmi_str + strlen(hdmi_str), ",pcm=%d", pcmdev);
    - if (!is_jack_detectable(codec, per_pin->pin_nid))
    - strncat(hdmi_str, " Phantom",
    - sizeof(hdmi_str) - strlen(hdmi_str) - 1);

    return snd_hda_jack_add_kctl(codec, per_pin->pin_nid, hdmi_str, 0);
    }



    \
     
     \ /
      Last update: 2013-03-13 00:41    [W:4.248 / U:0.516 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site