[kernel] r14057 - dists/lenny/linux-2.6/debian/patches/bugfix/all

[Dann Frazier]

Author: dannf
Date: Fri Jul 31 05:46:40 2009
New Revision: 14057

Log:
adjust to apply

Modified:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/alsa-via-fix-inversion-of-sound-and-side-channels.patch

Modified: dists/lenny/linux-2.6/debian/patches/bugfix/all/alsa-via-fix-inversion-of-sound-and-side-channels.patch
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/bugfix/all/alsa-via-fix-inversion-of-sound-and-side-channels.patch	Thu Jul 30 19:53:30 2009	(r14056)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/alsa-via-fix-inversion-of-sound-and-side-channels.patch	Fri Jul 31 05:46:40 2009	(r14057)
@@ -14,19 +14,20 @@
 Signed-off-by: Jaroslav Kysela <perex at perex.cz>
 ---
 
-diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
-index d397f52..bae6273 100644
---- a/sound/pci/hda/patch_via.c
-+++ b/sound/pci/hda/patch_via.c
-@@ -30,6 +30,7 @@
+Adjusted to apply to Debian's 2.6.26 by dann frazier <dannf at debian.org>
+
+diff -urpN linux-source-2.6.26.orig/sound/pci/hda/patch_via.c linux-source-2.6.26/sound/pci/hda/patch_via.c
+--- linux-source-2.6.26.orig/sound/pci/hda/patch_via.c	2008-07-13 15:51:29.000000000 -0600
++++ linux-source-2.6.26/sound/pci/hda/patch_via.c	2009-07-30 23:44:05.000000000 -0600
+@@ -29,6 +29,7 @@
+ /* 2006-09-08  Lydia Wang  Fix internal loopback recording source select bug */
  /* 2007-09-12  Lydia Wang  Add EAPD enable during driver initialization      */
  /* 2007-09-17  Lydia Wang  Add VT1708B codec support                        */
- /* 2007-11-14  Lydia Wang  Add VT1708A codec HP and CD pin connect config    */
 +/* 2008-02-03  Lydia Wang  Fix Rear channels and Back channels inverse issue */
  /*                                                                           */
  /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  
-@@ -660,10 +661,10 @@ static int vt1708_auto_fill_dac_nids(struct via_spec *spec,
+@@ -657,10 +658,10 @@ static int vt1708_auto_fill_dac_nids(str
  				spec->multiout.dac_nids[i] = 0x12;
  				break;
  			case AUTO_SEQ_SURROUND:
@@ -39,7 +40,7 @@
  				break;
  			}
  		}
-@@ -688,7 +689,7 @@ static int vt1708_auto_create_multi_out_ctls(struct via_spec *spec,
+@@ -685,7 +686,7 @@ static int vt1708_auto_create_multi_out_
  			continue;
  		
  		if (i != AUTO_SEQ_FRONT)
@@ -48,7 +49,7 @@
  
  		if (i == AUTO_SEQ_CENLFE) {
  			/* Center/LFE */
-@@ -1118,11 +1119,11 @@ static int vt1709_auto_fill_dac_nids(struct via_spec *spec,
+@@ -1090,11 +1091,11 @@ static int vt1709_auto_fill_dac_nids(str
  					break;
  				case AUTO_SEQ_SURROUND:
  					/* AOW3 */
@@ -62,7 +63,7 @@
  					break;
  				default:
  					break;
-@@ -1231,26 +1232,26 @@ static int vt1709_auto_create_multi_out_ctls(struct via_spec *spec,
+@@ -1203,26 +1204,26 @@ static int vt1709_auto_create_multi_out_
  		} else if (i == AUTO_SEQ_SURROUND) {
  			sprintf(name, "%s Playback Volume", chname[i]);
  			err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
@@ -93,7 +94,7 @@
  								  HDA_OUTPUT));
  			if (err < 0)
  				return err;
-@@ -1690,10 +1691,10 @@ static int vt1708B_auto_fill_dac_nids(struct via_spec *spec,
+@@ -1662,10 +1663,10 @@ static int vt1708B_auto_fill_dac_nids(st
  				spec->multiout.dac_nids[i] = 0x24;
  				break;
  			case AUTO_SEQ_SURROUND:
@@ -106,7 +107,7 @@
  				break;
  			}
  		}
-@@ -1708,7 +1709,7 @@ static int vt1708B_auto_create_multi_out_ctls(struct via_spec *spec,
+@@ -1680,7 +1681,7 @@ static int vt1708B_auto_create_multi_out
  {
  	char name[32];
  	static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" };