From: Greg Kroah-Hartman Date: Fri, 15 Nov 2013 07:15:55 +0000 (+0900) Subject: 3.11-stable patches X-Git-Tag: v3.4.70~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=052f0b2cb449a10629563b6d57fb5daa01188169;p=thirdparty%2Fkernel%2Fstable-queue.git 3.11-stable patches added patches: alsa-hda-hdmi-fix-reported-channel-map-on-common-default-layouts.patch usb-add-new-zte-3g-dongle-s-pid-to-option.c.patch --- diff --git a/queue-3.11/alsa-hda-hdmi-fix-reported-channel-map-on-common-default-layouts.patch b/queue-3.11/alsa-hda-hdmi-fix-reported-channel-map-on-common-default-layouts.patch new file mode 100644 index 00000000000..dd48c961f0e --- /dev/null +++ b/queue-3.11/alsa-hda-hdmi-fix-reported-channel-map-on-common-default-layouts.patch @@ -0,0 +1,52 @@ +From 56cac413dd6d43af8355f5d1f90a199b540f73fc Mon Sep 17 00:00:00 2001 +From: Anssi Hannula +Date: Sat, 5 Oct 2013 02:25:38 +0300 +Subject: ALSA: hda - hdmi: Fix reported channel map on common default layouts + +From: Anssi Hannula + +commit 56cac413dd6d43af8355f5d1f90a199b540f73fc upstream. + +hdmi_setup_fake_chmap() is supposed to set the reported channel map when +the channel map is not specified by the user. + +However, the function indexes channel_allocations[] with a wrong value +and extracts the wrong nibble from hdmi_channel_mapping[], causing wrong +channel maps to be shown. + +Fix those issues. + +Tested on Intel HDMI to correctly generate various channel maps, for +example 3,4,14,15,7,8,5,6 (instead of incorrect 3,4,8,7,5,6,14,0) for +standard 7.1 channel audio. (Note that the side and rear channels are +reported as RL/RR and RLC/RRC, respectively, as per the CEA-861 +standard, instead of the more traditional SL/SR and RL/RR.) + +Note that this only fixes the layouts that only contain traditional 7.1 +speakers (2.0, 2.1, 4.0, 5.1, 7.1, etc.). E.g. the rear center of 6.1 +is still being shown wrongly due to an issue with from_cea_slot() +which will be fixed in a later patch. + +Signed-off-by: Anssi Hannula +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_hdmi.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/sound/pci/hda/patch_hdmi.c ++++ b/sound/pci/hda/patch_hdmi.c +@@ -738,9 +738,10 @@ static int hdmi_manual_setup_channel_map + static void hdmi_setup_fake_chmap(unsigned char *map, int ca) + { + int i; ++ int ordered_ca = get_channel_allocation_order(ca); + for (i = 0; i < 8; i++) { +- if (i < channel_allocations[ca].channels) +- map[i] = from_cea_slot((hdmi_channel_mapping[ca][i] >> 4) & 0x0f); ++ if (i < channel_allocations[ordered_ca].channels) ++ map[i] = from_cea_slot(hdmi_channel_mapping[ca][i] & 0x0f); + else + map[i] = 0; + } diff --git a/queue-3.11/series b/queue-3.11/series index a111946c47b..ed0f82f9ce5 100644 --- a/queue-3.11/series +++ b/queue-3.11/series @@ -11,3 +11,5 @@ xen-netback-handle-backend-state-transitions-in-a-more-robust-way.patch xen-netback-transition-to-closed-when-removing-a-vif.patch thermal-x86_pkg_temp-change-spin-lock.patch hyperv-fb-add-pci-stub.patch +usb-add-new-zte-3g-dongle-s-pid-to-option.c.patch +alsa-hda-hdmi-fix-reported-channel-map-on-common-default-layouts.patch diff --git a/queue-3.11/usb-add-new-zte-3g-dongle-s-pid-to-option.c.patch b/queue-3.11/usb-add-new-zte-3g-dongle-s-pid-to-option.c.patch new file mode 100644 index 00000000000..5300e1430a7 --- /dev/null +++ b/queue-3.11/usb-add-new-zte-3g-dongle-s-pid-to-option.c.patch @@ -0,0 +1,43 @@ +From 0636fc507a976cdc40f21bdbcce6f0b98ff1dfe9 Mon Sep 17 00:00:00 2001 +From: Rui li +Date: Fri, 25 Oct 2013 10:57:21 +0800 +Subject: USB: add new zte 3g-dongle's pid to option.c + +From: Rui li + +commit 0636fc507a976cdc40f21bdbcce6f0b98ff1dfe9 upstream. + +Signed-off-by: Rui li +Cc: stable +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/option.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -1376,6 +1376,23 @@ static const struct usb_device_id option + .driver_info = (kernel_ulong_t)&net_intf2_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1426, 0xff, 0xff, 0xff), /* ZTE MF91 */ + .driver_info = (kernel_ulong_t)&net_intf2_blacklist }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1533, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1534, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1535, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1545, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1546, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1547, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1565, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1566, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1567, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1589, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1590, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1591, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1592, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1594, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1596, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1598, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1600, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2002, 0xff, + 0xff, 0xff), .driver_info = (kernel_ulong_t)&zte_k3765_z_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2003, 0xff, 0xff, 0xff) },