]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Jun 2014 14:24:19 +0000 (10:24 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Jun 2014 14:24:19 +0000 (10:24 -0400)
added patches:
alsa-hda-realtek-add-support-of-alc891-codec.patch

queue-3.4/alsa-hda-realtek-add-support-of-alc891-codec.patch [new file with mode: 0644]
queue-3.4/nohz-fix-another-inconsistency-between-config_no_hz-n-and-nohz-off.patch
queue-3.4/series

diff --git a/queue-3.4/alsa-hda-realtek-add-support-of-alc891-codec.patch b/queue-3.4/alsa-hda-realtek-add-support-of-alc891-codec.patch
new file mode 100644 (file)
index 0000000..0217211
--- /dev/null
@@ -0,0 +1,29 @@
+From b6c5fbad16aa5026f508093a8d651c25e1cb6179 Mon Sep 17 00:00:00 2001
+From: Kailang Yang <kailang@realtek.com>
+Date: Thu, 5 Jun 2014 11:13:44 +0800
+Subject: ALSA: hda/realtek - Add support of ALC891 codec
+
+From: Kailang Yang <kailang@realtek.com>
+
+commit b6c5fbad16aa5026f508093a8d651c25e1cb6179 upstream.
+
+New codec support for ALC891.
+
+Signed-off-by: Kailang Yang <kailang@realtek.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_realtek.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -7062,6 +7062,7 @@ static const struct hda_codec_preset snd
+       { .id = 0x10ec0670, .name = "ALC670", .patch = patch_alc662 },
+       { .id = 0x10ec0671, .name = "ALC671", .patch = patch_alc662 },
+       { .id = 0x10ec0680, .name = "ALC680", .patch = patch_alc680 },
++      { .id = 0x10ec0867, .name = "ALC891", .patch = patch_alc882 },
+       { .id = 0x10ec0880, .name = "ALC880", .patch = patch_alc880 },
+       { .id = 0x10ec0882, .name = "ALC882", .patch = patch_alc882 },
+       { .id = 0x10ec0883, .name = "ALC883", .patch = patch_alc882 },
index f6acc5f4ca8d727d3248479e3492d43c7ccaa924..c12c4d4c2fc3b5368544dea23f00a5b567155e3f 100644 (file)
@@ -22,19 +22,21 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
 Cc: Rui Xiang <rui.xiang@huawei.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
-diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
-index a12df5abde0b..ea20f7d1ac2c 100644
+---
+ kernel/time/tick-sched.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
 --- a/kernel/time/tick-sched.c
 +++ b/kernel/time/tick-sched.c
-@@ -711,8 +711,10 @@ static bool can_stop_idle_tick(int cpu, struct tick_sched *ts)
-               return false;
+@@ -296,8 +296,10 @@ static void tick_nohz_stop_sched_tick(st
+                       tick_do_timer_cpu = TICK_DO_TIMER_NONE;
        }
  
 -      if (unlikely(ts->nohz_mode == NOHZ_MODE_INACTIVE))
 +      if (unlikely(ts->nohz_mode == NOHZ_MODE_INACTIVE)) {
 +              ts->sleep_length = (ktime_t) { .tv64 = NSEC_PER_SEC/HZ };
-               return false;
+               return;
 +      }
  
        if (need_resched())
-               return false;
+               return;
index 4c5a2dfdec145697fb0d41e83c6cd0a7026c6af9..00441bad12c60438ffc38f92fae4a2d51170e182 100644 (file)
@@ -15,3 +15,4 @@ usb-cdc-acm-fix-shutdown-and-suspend-race.patch
 usb-cdc-acm-fix-i-o-after-failed-open.patch
 usb-cdc-acm-fix-runtime-pm-imbalance-at-shutdown.patch
 nohz-fix-another-inconsistency-between-config_no_hz-n-and-nohz-off.patch
+alsa-hda-realtek-add-support-of-alc891-codec.patch