From: Greg Kroah-Hartman Date: Wed, 19 Mar 2014 23:50:19 +0000 (+0000) Subject: 3.4-stable patches X-Git-Tag: v3.4.84~38 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f162d70746f661c308d1c870c6a0a827667f8c8;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: alsa-oxygen-xonar-dg-x-capture-from-i2s-channel-1-not-2.patch alsa-usb-audio-add-quirk-for-logitech-webcam-c500.patch powerpc-align-p_dyn-p_rela-and-p_st-symbols.patch --- diff --git a/queue-3.4/alsa-oxygen-xonar-dg-x-capture-from-i2s-channel-1-not-2.patch b/queue-3.4/alsa-oxygen-xonar-dg-x-capture-from-i2s-channel-1-not-2.patch new file mode 100644 index 00000000000..114ade0366f --- /dev/null +++ b/queue-3.4/alsa-oxygen-xonar-dg-x-capture-from-i2s-channel-1-not-2.patch @@ -0,0 +1,32 @@ +From 3dd77654fb1d7f68b9739f3039bad8dbbc0739f8 Mon Sep 17 00:00:00 2001 +From: Roman Volkov +Date: Fri, 24 Jan 2014 16:18:14 +0400 +Subject: ALSA: oxygen: Xonar DG(X): capture from I2S channel 1, not 2 + +From: Roman Volkov + +commit 3dd77654fb1d7f68b9739f3039bad8dbbc0739f8 upstream. + +Actually CS4245 connected to the I2S channel 1 for +capture, not channel 2. Otherwise capturing and +playback does not work for CS4245. + +Signed-off-by: Roman Volkov +Signed-off-by: Clemens Ladisch +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/oxygen/xonar_dg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/pci/oxygen/xonar_dg.c ++++ b/sound/pci/oxygen/xonar_dg.c +@@ -597,7 +597,7 @@ struct oxygen_model model_xonar_dg = { + .model_data_size = sizeof(struct dg), + .device_config = PLAYBACK_0_TO_I2S | + PLAYBACK_1_TO_SPDIF | +- CAPTURE_0_FROM_I2S_2 | ++ CAPTURE_0_FROM_I2S_1 | + CAPTURE_1_FROM_SPDIF, + .dac_channels_pcm = 6, + .dac_channels_mixer = 0, diff --git a/queue-3.4/alsa-usb-audio-add-quirk-for-logitech-webcam-c500.patch b/queue-3.4/alsa-usb-audio-add-quirk-for-logitech-webcam-c500.patch new file mode 100644 index 00000000000..066e6445f4f --- /dev/null +++ b/queue-3.4/alsa-usb-audio-add-quirk-for-logitech-webcam-c500.patch @@ -0,0 +1,29 @@ +From e805ca8b0a9b6c91099c0eaa4b160a1196a4ae25 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Wed, 5 Mar 2014 12:34:39 +0100 +Subject: ALSA: usb-audio: Add quirk for Logitech Webcam C500 + +From: Takashi Iwai + +commit e805ca8b0a9b6c91099c0eaa4b160a1196a4ae25 upstream. + +Logitech C500 (046d:0807) needs the same workaround like other +Logitech Webcams. + +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/usb/mixer.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/usb/mixer.c ++++ b/sound/usb/mixer.c +@@ -819,6 +819,7 @@ static void volume_control_quirks(struct + } + break; + ++ case USB_ID(0x046d, 0x0807): /* Logitech Webcam C500 */ + case USB_ID(0x046d, 0x0808): + case USB_ID(0x046d, 0x0809): + case USB_ID(0x046d, 0x081b): /* HD Webcam c310 */ diff --git a/queue-3.4/powerpc-align-p_dyn-p_rela-and-p_st-symbols.patch b/queue-3.4/powerpc-align-p_dyn-p_rela-and-p_st-symbols.patch new file mode 100644 index 00000000000..42ffabe6a6a --- /dev/null +++ b/queue-3.4/powerpc-align-p_dyn-p_rela-and-p_st-symbols.patch @@ -0,0 +1,32 @@ +From a5b2cf5b1af424ee3dd9e3ce6d5cea18cb927e67 Mon Sep 17 00:00:00 2001 +From: Anton Blanchard +Date: Tue, 4 Mar 2014 08:31:24 +1100 +Subject: powerpc: Align p_dyn, p_rela and p_st symbols + +From: Anton Blanchard + +commit a5b2cf5b1af424ee3dd9e3ce6d5cea18cb927e67 upstream. + +The 64bit relocation code places a few symbols in the text segment. +These symbols are only 4 byte aligned where they need to be 8 byte +aligned. Add an explicit alignment. + +Signed-off-by: Anton Blanchard +Tested-by: Laurent Dufour +Signed-off-by: Benjamin Herrenschmidt +Signed-off-by: Greg Kroah-Hartman + +--- + arch/powerpc/kernel/reloc_64.S | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/powerpc/kernel/reloc_64.S ++++ b/arch/powerpc/kernel/reloc_64.S +@@ -81,6 +81,7 @@ _GLOBAL(relocate) + + 6: blr + ++.balign 8 + p_dyn: .llong __dynamic_start - 0b + p_rela: .llong __rela_dyn_start - 0b + p_st: .llong _stext - 0b diff --git a/queue-3.4/series b/queue-3.4/series index 65ec9ba4952..bb9d1835239 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -9,3 +9,6 @@ mac80211-fix-ap-powersave-tx-vs.-wakeup-race.patch ath9k-fix-etsi-compliance-for-ar9462-2.0.patch mwifiex-copy-ap-s-ht-capability-info-correctly.patch drm-ttm-don-t-oops-if-no-invalidate_caches.patch +alsa-oxygen-xonar-dg-x-capture-from-i2s-channel-1-not-2.patch +alsa-usb-audio-add-quirk-for-logitech-webcam-c500.patch +powerpc-align-p_dyn-p_rela-and-p_st-symbols.patch