From: Greg Kroah-Hartman Date: Wed, 10 Oct 2012 07:08:47 +0000 (+0900) Subject: remove some 3.0 patches X-Git-Tag: v3.0.46~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77234e5b3c836807ae58dcb23343e5f1015b13ee;p=thirdparty%2Fkernel%2Fstable-queue.git remove some 3.0 patches Deleted: queue-3.0/alsa-hda-limit-internal-mic-boost-for-asus-x202e.patch queue-3.0/efi-initialize-efi.runtime_version-to-make-query_variable_info-update_capsule-workable.patch --- diff --git a/queue-3.0/alsa-hda-limit-internal-mic-boost-for-asus-x202e.patch b/queue-3.0/alsa-hda-limit-internal-mic-boost-for-asus-x202e.patch deleted file mode 100644 index 88a8b6345ca..00000000000 --- a/queue-3.0/alsa-hda-limit-internal-mic-boost-for-asus-x202e.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 4b527b6516ab1f0af8aaedd02dbf71ee2c1180f4 Mon Sep 17 00:00:00 2001 -From: David Henningsson -Date: Tue, 18 Sep 2012 14:26:59 +0200 -Subject: ALSA: hda - limit internal mic boost for Asus X202E - -From: David Henningsson - -commit 4b527b6516ab1f0af8aaedd02dbf71ee2c1180f4 upstream. - -When the input gain for the internal mic is set to its maximum level, -the background noise becomes so high - and any relevant signal clipped - -that the setting becomes unusable. It is better to limit the amplification. - -BugLink: https://bugs.launchpad.net/bugs/1052460 -Signed-off-by: David Henningsson -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman - ---- - sound/pci/hda/patch_via.c | 29 +++++++++++++++++++++++++++++ - 1 file changed, 29 insertions(+) - ---- a/sound/pci/hda/patch_via.c -+++ b/sound/pci/hda/patch_via.c -@@ -5724,6 +5724,32 @@ static void set_widgets_power_state_vt20 - AC_VERB_SET_POWER_STATE, AC_PWRST_D3); - } - -+/* -+ * pin fix-up -+ */ -+enum { -+ VIA_FIXUP_INTMIC_BOOST, -+}; -+ -+static void via_fixup_intmic_boost(struct hda_codec *codec, -+ const struct hda_fixup *fix, int action) -+{ -+ if (action == HDA_FIXUP_ACT_PRE_PROBE) -+ override_mic_boost(codec, 0x30, 0, 2, 40); -+} -+ -+static const struct hda_fixup via_fixups[] = { -+ [VIA_FIXUP_INTMIC_BOOST] = { -+ .type = HDA_FIXUP_FUNC, -+ .v.func = via_fixup_intmic_boost, -+ }, -+}; -+ -+static const struct snd_pci_quirk vt2002p_fixups[] = { -+ SND_PCI_QUIRK(0x1043, 0x8532, "Asus X202E", VIA_FIXUP_INTMIC_BOOST), -+ {} -+}; -+ - /* patch for vt2002P */ - static int patch_vt2002P(struct hda_codec *codec) - { -@@ -5735,6 +5761,9 @@ static int patch_vt2002P(struct hda_code - if (spec == NULL) - return -ENOMEM; - -+ snd_hda_pick_fixup(codec, NULL, vt2002p_fixups, via_fixups); -+ snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE); -+ - /* automatic parse from the BIOS config */ - err = vt2002P_parse_auto_config(codec); - if (err < 0) { diff --git a/queue-3.0/efi-initialize-efi.runtime_version-to-make-query_variable_info-update_capsule-workable.patch b/queue-3.0/efi-initialize-efi.runtime_version-to-make-query_variable_info-update_capsule-workable.patch deleted file mode 100644 index 52c561370df..00000000000 --- a/queue-3.0/efi-initialize-efi.runtime_version-to-make-query_variable_info-update_capsule-workable.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d6cf86d8f23253225fe2a763d627ecf7dfee9dae Mon Sep 17 00:00:00 2001 -From: Seiji Aguchi -Date: Tue, 24 Jul 2012 13:27:23 +0000 -Subject: efi: initialize efi.runtime_version to make query_variable_info/update_capsule workable - -From: Seiji Aguchi - -commit d6cf86d8f23253225fe2a763d627ecf7dfee9dae upstream. - -A value of efi.runtime_version is checked before calling -update_capsule()/query_variable_info() as follows. -But it isn't initialized anywhere. - - -static efi_status_t virt_efi_query_variable_info(u32 attr, - u64 *storage_space, - u64 *remaining_space, - u64 *max_variable_size) -{ - if (efi.runtime_version < EFI_2_00_SYSTEM_TABLE_REVISION) - return EFI_UNSUPPORTED; - - -This patch initializes a value of efi.runtime_version at boot time. - -Signed-off-by: Seiji Aguchi -Acked-by: Matthew Garrett -Signed-off-by: Matt Fleming -Signed-off-by: Ivan Hu -Signed-off-by: Greg Kroah-Hartman - ---- - arch/x86/platform/efi/efi.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/arch/x86/platform/efi/efi.c -+++ b/arch/x86/platform/efi/efi.c -@@ -659,6 +659,7 @@ void __init efi_enter_virtual_mode(void) - * - * Call EFI services through wrapper functions. - */ -+ efi.runtime_version = efi_systab.fw_revision; - efi.get_time = virt_efi_get_time; - efi.set_time = virt_efi_set_time; - efi.get_wakeup_time = virt_efi_get_wakeup_time; diff --git a/queue-3.0/series b/queue-3.0/series index c397a925f26..7b1574980fb 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -51,7 +51,6 @@ asoc-wm9712-fix-name-of-capture-switch.patch mm-fix-invalidate_complete_page2-lock-ordering.patch mm-thp-fix-pmd_present-for-split_huge_page-and-prot_none-with-thp.patch alsa-aloop-add-locking-to-timer-access.patch -alsa-hda-limit-internal-mic-boost-for-asus-x202e.patch alsa-usb-disable-broken-hw-volume-for-tenx-tp6911.patch alsa-usb-support-for-original-xbox-communicator.patch drm-radeon-only-adjust-default-clocks-on-ni-gpus.patch @@ -77,5 +76,4 @@ mempolicy-remove-mempolicy-sharing.patch mempolicy-fix-a-race-in-shared_policy_replace.patch mempolicy-fix-refcount-leak-in-mpol_set_shared_policy.patch mempolicy-fix-a-memory-corruption-by-refcount-imbalance-in-alloc_pages_vma.patch -efi-initialize-efi.runtime_version-to-make-query_variable_info-update_capsule-workable.patch cpu-hotplug-cpusets-suspend-don-t-modify-cpusets-during-suspend-resume.patch