[kernel] r16335 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sun Sep 19 02:12:56 2010
New Revision: 16335

Log:
snd-hda-codec-via: Fix syntax error when CONFIG_SND_HDA_POWER_SAVE is disabled (Closes: #597043)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/sound-use-semicolons-to-end-statements.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/24

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Sep 19 01:57:36 2010	(r16334)
+++ dists/sid/linux-2.6/debian/changelog	Sun Sep 19 02:12:56 2010	(r16335)
@@ -3,6 +3,8 @@
   [ Ben Hutchings ]
   * speakup: Update to match Debian package version 3.1.5.dfsg.1-1
   * scsi_dh_emc: Fix mode select request setup (Closes: #591540)
+  * snd-hda-codec-via: Fix syntax error when CONFIG_SND_HDA_POWER_SAVE is
+    disabled (Closes: #597043)
 
   [ Martin Michlmayr ]
   * ARM: update mach types.

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/sound-use-semicolons-to-end-statements.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sound-use-semicolons-to-end-statements.patch	Sun Sep 19 02:12:56 2010	(r16335)
@@ -0,0 +1,66 @@
+From: Stephen Rothwell <sfr at 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 at canb.auug.org.au>
+Signed-off-by: Takashi Iwai <tiwai at 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
+

Modified: dists/sid/linux-2.6/debian/patches/series/24
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/24	Sun Sep 19 01:57:36 2010	(r16334)
+++ dists/sid/linux-2.6/debian/patches/series/24	Sun Sep 19 02:12:56 2010	(r16335)
@@ -2,3 +2,4 @@
 + bugfix/all/SCSI-scsi_dh_emc-fix-mode-select-request-setup.patch
 + bugfix/all/SCSI-scsi_dh_emc-request-flag-cleanup.patch
 + features/arm/mach-types-update-2010-09-09.patch
++ bugfix/all/sound-use-semicolons-to-end-statements.patch