ALSA: hda - initialize audio InfoFrame to be all zero
diff mbox

Message ID f37b3349bd0a4f5989cf503f578e25ad0f7d160e.1394572173.git.mengdong.lin@intel.com
State Accepted
Headers show

Commit Message

Lin, Mengdong March 11, 2014, 9:12 p.m. UTC
From: Mengdong Lin <mengdong.lin@intel.com>

This patch initialized the local audio InfoFrame variable 'ai' to be all zero,
thus the data bytes will indicate "Refer to Stream Header" by default.

Signed-off-by: Mengdong Lin <mengdong.lin@intel.com>

Comments

Takashi Iwai March 11, 2014, 8:16 a.m. UTC | #1
At Tue, 11 Mar 2014 17:12:52 -0400,
mengdong.lin@intel.com wrote:
> 
> From: Mengdong Lin <mengdong.lin@intel.com>
> 
> This patch initialized the local audio InfoFrame variable 'ai' to be all zero,
> thus the data bytes will indicate "Refer to Stream Header" by default.
> 
> Signed-off-by: Mengdong Lin <mengdong.lin@intel.com>

Thanks, applied.


Takashi

> 
> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
> index 5ef9503..3ab7063 100644
> --- a/sound/pci/hda/patch_hdmi.c
> +++ b/sound/pci/hda/patch_hdmi.c
> @@ -1062,6 +1062,7 @@ static void hdmi_pin_setup_infoframe(struct hda_codec *codec,
>  {
>  	union audio_infoframe ai;
>  
> +	memset(&ai, 0, sizeof(ai));
>  	if (conn_type == 0) { /* HDMI */
>  		struct hdmi_audio_infoframe *hdmi_ai = &ai.hdmi;
>  
> -- 
> 1.8.1.2
>
David Henningsson July 22, 2014, 6:52 a.m. UTC | #2
Hi,

It looks like this patch should have been sent to stable, is there any 
reason why it wasn't?

On 2014-03-11 22:12, mengdong.lin@intel.com wrote:
> From: Mengdong Lin <mengdong.lin@intel.com>
>
> This patch initialized the local audio InfoFrame variable 'ai' to be all zero,
> thus the data bytes will indicate "Refer to Stream Header" by default.
>
> Signed-off-by: Mengdong Lin <mengdong.lin@intel.com>
>
> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
> index 5ef9503..3ab7063 100644
> --- a/sound/pci/hda/patch_hdmi.c
> +++ b/sound/pci/hda/patch_hdmi.c
> @@ -1062,6 +1062,7 @@ static void hdmi_pin_setup_infoframe(struct hda_codec *codec,
>   {
>   	union audio_infoframe ai;
>
> +	memset(&ai, 0, sizeof(ai));
>   	if (conn_type == 0) { /* HDMI */
>   		struct hdmi_audio_infoframe *hdmi_ai = &ai.hdmi;
>
>
Takashi Iwai July 22, 2014, 7:01 a.m. UTC | #3
At Tue, 22 Jul 2014 08:52:31 +0200,
David Henningsson wrote:
> 
> Hi,
> 
> It looks like this patch should have been sent to stable, is there any 
> reason why it wasn't?

Just forgotten, I suppose.  This should be included in stable, indeed.

Greg, could you cherry-pick this upstream commit
caaf5ef9493f72390905f1e97b310b8906d32dac
   ALSA: hda - initialize audio InfoFrame to be all zero

to stable kernels?


thanks,

Takashi


> 
> On 2014-03-11 22:12, mengdong.lin@intel.com wrote:
> > From: Mengdong Lin <mengdong.lin@intel.com>
> >
> > This patch initialized the local audio InfoFrame variable 'ai' to be all zero,
> > thus the data bytes will indicate "Refer to Stream Header" by default.
> >
> > Signed-off-by: Mengdong Lin <mengdong.lin@intel.com>
> >
> > diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
> > index 5ef9503..3ab7063 100644
> > --- a/sound/pci/hda/patch_hdmi.c
> > +++ b/sound/pci/hda/patch_hdmi.c
> > @@ -1062,6 +1062,7 @@ static void hdmi_pin_setup_infoframe(struct hda_codec *codec,
> >   {
> >   	union audio_infoframe ai;
> >
> > +	memset(&ai, 0, sizeof(ai));
> >   	if (conn_type == 0) { /* HDMI */
> >   		struct hdmi_audio_infoframe *hdmi_ai = &ai.hdmi;
> >
> >
> 
> -- 
> David Henningsson, Canonical Ltd.
> https://launchpad.net/~diwic
>
Greg KH July 23, 2014, 12:08 a.m. UTC | #4
On Tue, Jul 22, 2014 at 09:01:51AM +0200, Takashi Iwai wrote:
> At Tue, 22 Jul 2014 08:52:31 +0200,
> David Henningsson wrote:
> > 
> > Hi,
> > 
> > It looks like this patch should have been sent to stable, is there any 
> > reason why it wasn't?
> 
> Just forgotten, I suppose.  This should be included in stable, indeed.
> 
> Greg, could you cherry-pick this upstream commit
> caaf5ef9493f72390905f1e97b310b8906d32dac
>    ALSA: hda - initialize audio InfoFrame to be all zero
> 
> to stable kernels?

Only seemd to apply to 3.14-stable, so I put it there.

thanks,

greg k-h
Takashi Iwai July 23, 2014, 10:19 a.m. UTC | #5
At Tue, 22 Jul 2014 17:08:52 -0700,
Greg KH wrote:
> 
> On Tue, Jul 22, 2014 at 09:01:51AM +0200, Takashi Iwai wrote:
> > At Tue, 22 Jul 2014 08:52:31 +0200,
> > David Henningsson wrote:
> > > 
> > > Hi,
> > > 
> > > It looks like this patch should have been sent to stable, is there any 
> > > reason why it wasn't?
> > 
> > Just forgotten, I suppose.  This should be included in stable, indeed.
> > 
> > Greg, could you cherry-pick this upstream commit
> > caaf5ef9493f72390905f1e97b310b8906d32dac
> >    ALSA: hda - initialize audio InfoFrame to be all zero
> > 
> > to stable kernels?
> 
> Only seemd to apply to 3.14-stable, so I put it there.

Fair enough.  The only missing would be 3.13, so Canonical should take
care of it.


Thanks!

Takashi

Patch
diff mbox

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 5ef9503..3ab7063 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1062,6 +1062,7 @@  static void hdmi_pin_setup_infoframe(struct hda_codec *codec,
 {
 	union audio_infoframe ai;
 
+	memset(&ai, 0, sizeof(ai));
 	if (conn_type == 0) { /* HDMI */
 		struct hdmi_audio_infoframe *hdmi_ai = &ai.hdmi;