On Wed, 2010-09-15 at 21:22 -0700, George Ronkin wrote: > Package: linux-source-2.6.32 > Version: 2.6.32-22 > Severity: normal > > If CONFIG_SND_HDA_POWER_SAVE is not set, sound/pci/hda/patch_via.c > no longer compiles in linux-source-2.6.32 version 2.6.32-22. Setting > CONFIG_SND_HDA_POWER_SAVE was not necessary in 2.6.32-21 and prior > versions. I had oldconfig'ed the .config I used for 2.6.32-21 before > attempting to build 2.6.32-22, but my unset CONFIG_SND_HDA_POWER_SAVE was > neither detected nor changed. > Setting CONFIG_SND_HDA_POWER_SAVE works around the problem. Presumably > the cause is the Debian changes to patch_via.c for 2.6.32-22, so I'd > recommend fixing them, but at least this should be documented and caught > by an oldconfig. The 'Debian changes' are taken from a later upstream version. However I failed to notice that they introduced this regression, or that there was a later fix for it. Tthe attached patch fixes this and will be included in 2.6.32-24. Ben. -- Ben Hutchings Once a job is fouled up, anything done to improve it makes it worse.
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 12 Oct 2009 15:56:17 +1100 Subject: [PATCH] sound: use semicolons to end statements commit 0f48327eac5f65ad029d7112cac97577766730ba upstream. Fixes: sound/pci/hda/patch_via.c: In function 'patch_vt1718S': sound/pci/hda/patch_via.c:4951: error: expected expression before 'return' sound/pci/hda/patch_via.c: In function 'patch_vt1716S': sound/pci/hda/patch_via.c:5441: error: expected expression before 'return' sound/pci/hda/patch_via.c: In function 'patch_vt2002P': sound/pci/hda/patch_via.c:5794: error: expected expression before 'return' sound/pci/hda/patch_via.c: In function 'patch_vt1812': sound/pci/hda/patch_via.c:6148: error: expected expression before 'return' Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Takashi Iwai <tiwai@suse.de> --- sound/pci/hda/patch_via.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index 30260e2..a294060 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c @@ -4942,7 +4942,7 @@ static int patch_vt1718S(struct hda_codec *codec) codec->patch_ops = via_patch_ops; codec->patch_ops.init = via_auto_init; - codec->patch_ops.unsol_event = via_unsol_event, + codec->patch_ops.unsol_event = via_unsol_event; #ifdef CONFIG_SND_HDA_POWER_SAVE spec->loopback.amplist = vt1718S_loopbacks; @@ -5432,7 +5432,7 @@ static int patch_vt1716S(struct hda_codec *codec) codec->patch_ops = via_patch_ops; codec->patch_ops.init = via_auto_init; - codec->patch_ops.unsol_event = via_unsol_event, + codec->patch_ops.unsol_event = via_unsol_event; #ifdef CONFIG_SND_HDA_POWER_SAVE spec->loopback.amplist = vt1716S_loopbacks; @@ -5785,7 +5785,7 @@ static int patch_vt2002P(struct hda_codec *codec) codec->patch_ops = via_patch_ops; codec->patch_ops.init = via_auto_init; - codec->patch_ops.unsol_event = via_unsol_event, + codec->patch_ops.unsol_event = via_unsol_event; #ifdef CONFIG_SND_HDA_POWER_SAVE spec->loopback.amplist = vt2002P_loopbacks; @@ -6139,7 +6139,7 @@ static int patch_vt1812(struct hda_codec *codec) codec->patch_ops = via_patch_ops; codec->patch_ops.init = via_auto_init; - codec->patch_ops.unsol_event = via_unsol_event, + codec->patch_ops.unsol_event = via_unsol_event; #ifdef CONFIG_SND_HDA_POWER_SAVE spec->loopback.amplist = vt1812_loopbacks; -- 1.7.1
Attachment:
signature.asc
Description: This is a digitally signed message part