From: Greg Kroah-Hartman Date: Thu, 18 Oct 2012 20:09:43 +0000 (-0700) Subject: 3.0-stable patches X-Git-Tag: v3.0.47~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83b6a4055b96d23368005f91fd1efbf926191c2d;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: alsa-ac97-fix-missing-null-check-in-snd_ac97_cvol_new.patch alsa-emu10k1-add-chip-details-for-e-mu-1010-pcie-card.patch --- diff --git a/queue-3.0/alsa-ac97-fix-missing-null-check-in-snd_ac97_cvol_new.patch b/queue-3.0/alsa-ac97-fix-missing-null-check-in-snd_ac97_cvol_new.patch new file mode 100644 index 00000000000..aa62ea713a8 --- /dev/null +++ b/queue-3.0/alsa-ac97-fix-missing-null-check-in-snd_ac97_cvol_new.patch @@ -0,0 +1,29 @@ +From 733a48e5ae5bf28b046fad984d458c747cbb8c21 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Thu, 11 Oct 2012 16:43:40 +0200 +Subject: ALSA: ac97 - Fix missing NULL check in snd_ac97_cvol_new() + +From: Takashi Iwai + +commit 733a48e5ae5bf28b046fad984d458c747cbb8c21 upstream. + +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=44721 + +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/ac97/ac97_codec.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/sound/pci/ac97/ac97_codec.c ++++ b/sound/pci/ac97/ac97_codec.c +@@ -1271,6 +1271,8 @@ static int snd_ac97_cvol_new(struct snd_ + tmp.index = ac97->num; + kctl = snd_ctl_new1(&tmp, ac97); + } ++ if (!kctl) ++ return -ENOMEM; + if (reg >= AC97_PHONE && reg <= AC97_PCM) + set_tlv_db_scale(kctl, db_scale_5bit_12db_max); + else diff --git a/queue-3.0/alsa-emu10k1-add-chip-details-for-e-mu-1010-pcie-card.patch b/queue-3.0/alsa-emu10k1-add-chip-details-for-e-mu-1010-pcie-card.patch new file mode 100644 index 00000000000..f76976acc59 --- /dev/null +++ b/queue-3.0/alsa-emu10k1-add-chip-details-for-e-mu-1010-pcie-card.patch @@ -0,0 +1,38 @@ +From 10f571d09106c3eb85951896522c9650596eff2e Mon Sep 17 00:00:00 2001 +From: Maxim Kachur +Date: Wed, 17 Oct 2012 18:18:10 +0200 +Subject: ALSA: emu10k1: add chip details for E-mu 1010 PCIe card + +From: Maxim Kachur + +commit 10f571d09106c3eb85951896522c9650596eff2e upstream. + +Add chip details for E-mu 1010 PCIe card. It has the same +chip as found in E-mu 1010b but it uses different PCI id. + +Signed-off-by: Maxim Kachur +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/emu10k1/emu10k1_main.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/sound/pci/emu10k1/emu10k1_main.c ++++ b/sound/pci/emu10k1/emu10k1_main.c +@@ -1415,6 +1415,15 @@ static struct snd_emu_chip_details emu_c + .ca0108_chip = 1, + .spk71 = 1, + .emu_model = EMU_MODEL_EMU1010B}, /* EMU 1010 new revision */ ++ /* Tested by Maxim Kachur 17th Oct 2012. */ ++ /* This is MAEM8986, 0202 is MAEM8980 */ ++ {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40071102, ++ .driver = "Audigy2", .name = "E-mu 1010 PCIe [MAEM8986]", ++ .id = "EMU1010", ++ .emu10k2_chip = 1, ++ .ca0108_chip = 1, ++ .spk71 = 1, ++ .emu_model = EMU_MODEL_EMU1010B}, /* EMU 1010 PCIe */ + /* Tested by James@superbug.co.uk 8th July 2005. */ + /* This is MAEM8810, 0202 is MAEM8820 */ + {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40011102, diff --git a/queue-3.0/series b/queue-3.0/series index 790fb0f44d3..4f7b193a0bc 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -33,4 +33,6 @@ x86-random-architectural-inlines-to-get-random-integers-with-rdrand.patch x86-random-verify-rdrand-functionality-and-allow-it-to-be-disabled.patch tpm-propagate-error-from-tpm_transmit-to-fix-a-timeout-hang.patch udf-fix-retun-value-on-error-path-in-udf_load_logicalvol.patch +alsa-ac97-fix-missing-null-check-in-snd_ac97_cvol_new.patch +alsa-emu10k1-add-chip-details-for-e-mu-1010-pcie-card.patch slab-fix-the-deadlock-issue-on-l3-alien-lock.patch