3.4-stable patches

added patches:
	alsa-6fire-fix-probe-of-multiple-cards.patch
	alsa-hda-add-pincfg-fixup-for-asus-w5a.patch
	alsa-msnd-avoid-duplicated-driver-name.patch

diff --git a/queue-3.4/alsa-6fire-fix-probe-of-multiple-cards.patch b/queue-3.4/alsa-6fire-fix-probe-of-multiple-cards.patch
new file mode 100644 (file)
index 0000000..ad92077
--- /dev/null
+++ b/queue-3.4/alsa-6fire-fix-probe-of-multiple-cards.patch
@@ -0,0 +1,33 @@
+From 9b389a8a022110b4bc055a19b888283544d9eba6 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Mon, 28 Oct 2013 11:24:23 +0100
+Subject: ALSA: 6fire: Fix probe of multiple cards
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 9b389a8a022110b4bc055a19b888283544d9eba6 upstream.
+
+The probe code of snd-usb-6fire driver overrides the devices[] pointer
+wrongly without checking whether it's already occupied or not.  This
+would screw up the device disconnection later.
+
+Spotted by coverity CID 141423.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/usb/6fire/chip.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/usb/6fire/chip.c
++++ b/sound/usb/6fire/chip.c
+@@ -101,7 +101,7 @@ static int __devinit usb6fire_chip_probe
+                       usb_set_intfdata(intf, chips[i]);
+                       mutex_unlock(&register_mutex);
+                       return 0;
+-              } else if (regidx < 0)
++              } else if (!devices[i] && regidx < 0)
+                       regidx = i;
+       }
+       if (regidx < 0) {

diff --git a/queue-3.4/alsa-hda-add-pincfg-fixup-for-asus-w5a.patch b/queue-3.4/alsa-hda-add-pincfg-fixup-for-asus-w5a.patch
new file mode 100644 (file)
index 0000000..a36b411
--- /dev/null
+++ b/queue-3.4/alsa-hda-add-pincfg-fixup-for-asus-w5a.patch
@@ -0,0 +1,65 @@
+From 487a588d09db0d6508261867df208d8bdc718251 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Thu, 7 Nov 2013 07:29:30 +0100
+Subject: ALSA: hda - Add pincfg fixup for ASUS W5A
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 487a588d09db0d6508261867df208d8bdc718251 upstream.
+
+BIOS on ASUS W5A laptop with ALC880 codec doesn't provide any pin
+configurations, so we have to set up all pins manually.
+
+Reported-and-tested-by: nb <nb@dagami.org>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_realtek.c |   22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -4458,6 +4458,7 @@ enum {
+       ALC880_FIXUP_UNIWILL,
+       ALC880_FIXUP_UNIWILL_DIG,
+       ALC880_FIXUP_Z71V,
++      ALC880_FIXUP_ASUS_W5A,
+       ALC880_FIXUP_3ST_BASE,
+       ALC880_FIXUP_3ST,
+       ALC880_FIXUP_3ST_DIG,
+@@ -4619,6 +4620,26 @@ static const struct alc_fixup alc880_fix
+                       { }
+               }
+       },
++      [ALC880_FIXUP_ASUS_W5A] = {
++              .type = HDA_FIXUP_PINS,
++              .v.pins = (const struct hda_pintbl[]) {
++                      /* set up the whole pins as BIOS is utterly broken */
++                      { 0x14, 0x0121411f }, /* HP */
++                      { 0x15, 0x411111f0 }, /* N/A */
++                      { 0x16, 0x411111f0 }, /* N/A */
++                      { 0x17, 0x411111f0 }, /* N/A */
++                      { 0x18, 0x90a60160 }, /* mic */
++                      { 0x19, 0x411111f0 }, /* N/A */
++                      { 0x1a, 0x411111f0 }, /* N/A */
++                      { 0x1b, 0x411111f0 }, /* N/A */
++                      { 0x1c, 0x411111f0 }, /* N/A */
++                      { 0x1d, 0x411111f0 }, /* N/A */
++                      { 0x1e, 0xb743111e }, /* SPDIF out */
++                      { }
++              },
++              .chained = true,
++              .chain_id = ALC880_FIXUP_GPIO1,
++      },
+       [ALC880_FIXUP_3ST_BASE] = {
+               .type = ALC_FIXUP_PINS,
+               .v.pins = (const struct alc_pincfg[]) {
+@@ -4731,6 +4752,7 @@ static const struct alc_fixup alc880_fix
+ 
+ static const struct snd_pci_quirk alc880_fixup_tbl[] = {
+       SND_PCI_QUIRK(0x1019, 0x0f69, "Coeus G610P", ALC880_FIXUP_W810),
++      SND_PCI_QUIRK(0x1043, 0x10c3, "ASUS W5A", ALC880_FIXUP_ASUS_W5A),
+       SND_PCI_QUIRK(0x1043, 0x1964, "ASUS Z71V", ALC880_FIXUP_Z71V),
+       SND_PCI_QUIRK_VENDOR(0x1043, "ASUS", ALC880_FIXUP_GPIO1),
+       SND_PCI_QUIRK(0x1558, 0x5401, "Clevo GPIO2", ALC880_FIXUP_GPIO2),

diff --git a/queue-3.4/alsa-msnd-avoid-duplicated-driver-name.patch b/queue-3.4/alsa-msnd-avoid-duplicated-driver-name.patch
new file mode 100644 (file)
index 0000000..181686d
--- /dev/null
+++ b/queue-3.4/alsa-msnd-avoid-duplicated-driver-name.patch
@@ -0,0 +1,51 @@
+From 092f9cd16aac7d054af1755c945f37c1b33399e6 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Tue, 12 Nov 2013 08:06:20 +0100
+Subject: ALSA: msnd: Avoid duplicated driver name
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 092f9cd16aac7d054af1755c945f37c1b33399e6 upstream.
+
+msnd_pinnacle.c is used for both snd-msnd-pinnacle and
+snd-msnd-classic drivers, and both should have different driver
+names.  Using the same driver name results in the sysfs warning for
+duplicated entries like
+ kobject: 'msnd-pinnacle.7' (cec33408): kobject_release, parent   (null) (delayed)
+ kobject: 'msnd-pinnacle' (cecd4980): kobject_release, parent cf3ad9b0 (delayed)
+ ------------[ cut here ]------------
+ WARNING: CPU: 0 PID: 1 at fs/sysfs/dir.c:486 sysfs_warn_dup+0x7d/0xa0()
+ sysfs: cannot create duplicate filename '/bus/isa/drivers/msnd-pinnacle'
+ ......
+
+Reported-by: Fengguang Wu <fengguang.wu@intel.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/isa/msnd/msnd_pinnacle.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/sound/isa/msnd/msnd_pinnacle.c
++++ b/sound/isa/msnd/msnd_pinnacle.c
+@@ -73,9 +73,11 @@
+ #ifdef MSND_CLASSIC
+ #  include "msnd_classic.h"
+ #  define LOGNAME                     "msnd_classic"
++#  define DEV_NAME                    "msnd-classic"
+ #else
+ #  include "msnd_pinnacle.h"
+ #  define LOGNAME                     "snd_msnd_pinnacle"
++#  define DEV_NAME                    "msnd-pinnacle"
+ #endif
+ 
+ static void __devinit set_default_audio_parameters(struct snd_msnd *chip)
+@@ -1068,8 +1070,6 @@ static int __devexit snd_msnd_isa_remove
+       return 0;
+ }
+ 
+-#define DEV_NAME "msnd-pinnacle"
+-
+ static struct isa_driver snd_msnd_driver = {
+       .match          = snd_msnd_isa_match,
+       .probe          = snd_msnd_isa_probe,

diff --git a/queue-3.4/series b/queue-3.4/series
index 4f77e72708905bbe02acb629b1b14b608416b40f..ac800b2dc6abf874cc8bf56a2562b7353e693772 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -20,3 +20,6 @@ perf-ftrace-fix-paranoid-level-for-enabling-function-tracer.patch
 rt2x00-check-if-device-is-still-available-on-rt2x00mac_flush.patch
 revert-ima-policy-for-ramfs.patch
 exec-ptrace-fix-get_dumpable-incorrect-tests.patch
+alsa-6fire-fix-probe-of-multiple-cards.patch
+alsa-msnd-avoid-duplicated-driver-name.patch
+alsa-hda-add-pincfg-fixup-for-asus-w5a.patch