Re: [added to the 4.1 stable tree] ALSA: hda - Fix forgotten HDMI monitor_present update

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sun, 17 Apr 2016 11:53:03 +0200,
Sasha Levin wrote:
> 
> From: Takashi Iwai <tiwai@xxxxxxx>
> 
> This patch has been added to the 4.1 stable tree. If you have any
> objections, please let us know.
> 
> ===============
> 
> [ Upstream commit bd48128539ab89986b24ad08ecd3e027dd1993a1 ]
> 
> We forgot to copy monitor_present value when updating the ELD
> information.  This won't change the ELD retrieval and the jack
> notification behavior, but appears only in the proc output.   In that
> sense, it's no fatal error, but a bug is a bug is a bug.
> 
> Cc: <stable@xxxxxxxxxxxxxxx>
> Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
> Signed-off-by: Sasha Levin <sasha.levin@xxxxxxxxxx>

This caused a regression and fixed by the recent commit
023d8218ec0dfc30e11d4ec54f640e8f127d1fbe
    ALSA: hda - Fix regression of monitor_present flag in eld proc file
    
Please cherry-pick this, too.


thanks,

Takashi


> ---
>  sound/pci/hda/patch_hdmi.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
> index 973fab9..b320120 100644
> --- a/sound/pci/hda/patch_hdmi.c
> +++ b/sound/pci/hda/patch_hdmi.c
> @@ -1547,6 +1547,7 @@ static void update_eld(struct hda_codec *codec,
>  			   eld->eld_size) != 0)
>  			eld_changed = true;
>  
> +	pin_eld->monitor_present = eld->monitor_present;
>  	pin_eld->eld_valid = eld->eld_valid;
>  	pin_eld->eld_size = eld->eld_size;
>  	if (eld->eld_valid)
> -- 
> 2.5.0
> 
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]