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

[Dann Frazier]

Author: dannf
Date: Tue Dec 30 18:20:41 2008
New Revision: 12536

Log:
Fix speaker output on Toshiba P105 notebooks. (Closes: #488063)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/x86/alsa-fix-speaker-output-on-toshiba-p105.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/13

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Dec 30 18:20:41 2008
@@ -9,7 +9,10 @@
   [ Bastian Blank ]
   * Fix multicast in atl1e driver. (closes: 509097)
 
- -- dann frazier <dannf at debian.org>  Thu, 25 Dec 2008 14:26:02 -0700
+  [ Moritz Muehlenhoff ]
+  * Fix speaker output on Toshiba P105 notebooks. (Closes: #488063)
+
+ -- dann frazier <dannf at debian.org>  Tue, 30 Dec 2008 11:10:37 -0700
 
 linux-2.6 (2.6.26-12) unstable; urgency=high
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/x86/alsa-fix-speaker-output-on-toshiba-p105.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/alsa-fix-speaker-output-on-toshiba-p105.patch	Tue Dec 30 18:20:41 2008
@@ -0,0 +1,25 @@
+commit 6a9dccd61253f361760802d8d19c28fa83ea83f5
+Author: Takashi Iwai <tiwai at suse.de>
+Date:   Tue Jul 1 14:52:05 2008 +0200
+
+    ALSA: ALSA: hda - Fix speaker output on Toshiba P105
+    
+    Toshiba Satellite P105 with cx5045 has no HP pin but only a
+    speaker pin and does the speaker-muting on hardware.
+    Thus the matching model is laptop-micsense.
+    
+    Signed-off-by: Takashi Iwai <tiwai at suse.de>
+    Signed-off-by: Jaroslav Kysela <perex at perex.cz>
+
+diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
+index 64df810..95e3367 100644
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -906,6 +906,7 @@ static struct snd_pci_quirk cxt5045_cfg_tbl[] = {
+ 	SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV9533EG", CXT5045_LAPTOP_HPSENSE),
+ 	SND_PCI_QUIRK(0x103c, 0x30d5, "HP 530", CXT5045_LAPTOP_HP530),
+ 	SND_PCI_QUIRK(0x103c, 0x30d9, "HP Spartan", CXT5045_LAPTOP_HPSENSE),
++	SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba P105", CXT5045_LAPTOP_MICSENSE),
+ 	SND_PCI_QUIRK(0x152d, 0x0753, "Benq R55E", CXT5045_BENQ),
+ 	SND_PCI_QUIRK(0x1734, 0x10ad, "Fujitsu Si1520", CXT5045_LAPTOP_MICSENSE),
+ 	SND_PCI_QUIRK(0x1734, 0x10cb, "Fujitsu Si3515", CXT5045_LAPTOP_HPMICSENSE),

Modified: dists/sid/linux-2.6/debian/patches/series/13
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/13	(original)
+++ dists/sid/linux-2.6/debian/patches/series/13	Tue Dec 30 18:20:41 2008
@@ -2,3 +2,4 @@
 + bugfix/all/drivers-net-atl1e-multicast-crc.patch
 + bugfix/all/cciss-p711m,p712m-add-ids.patch
 + bugfix/all/watchdog-ib700wdt-buffer_underflow.patch
++ bugfix/x86/alsa-fix-speaker-output-on-toshiba-p105.patch