From: Greg Kroah-Hartman Date: Wed, 14 Jan 2015 01:34:12 +0000 (-0800) Subject: 3.14-stable patches X-Git-Tag: v3.10.65~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5344af449a9fe1e56a3907f8eed079d0f861eafe;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: add-usb_ehci_exynos-to-multi_v7_defconfig.patch usb-cdc-acm-check-for-valid-interfaces.patch --- diff --git a/queue-3.14/add-usb_ehci_exynos-to-multi_v7_defconfig.patch b/queue-3.14/add-usb_ehci_exynos-to-multi_v7_defconfig.patch new file mode 100644 index 00000000000..b60f676149b --- /dev/null +++ b/queue-3.14/add-usb_ehci_exynos-to-multi_v7_defconfig.patch @@ -0,0 +1,35 @@ +From 007487f1fd43d84f26cda926081ca219a24ecbc4 Mon Sep 17 00:00:00 2001 +From: Steev Klimaszewski +Date: Tue, 30 Dec 2014 00:55:48 -0600 +Subject: Add USB_EHCI_EXYNOS to multi_v7_defconfig + +From: Steev Klimaszewski + +commit 007487f1fd43d84f26cda926081ca219a24ecbc4 upstream. + +Currently we enable Exynos devices in the multi v7 defconfig, however, when +testing on my ODROID-U3, I noticed that USB was not working. Enabling this +option causes USB to work, which enables networking support as well since the +ODROID-U3 has networking on the USB bus. + +[arnd] Support for odroid-u3 was added in 3.10, so it would be nice to +backport this fix at least that far. + +Signed-off-by: Steev Klimaszewski +Signed-off-by: Arnd Bergmann +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/configs/multi_v7_defconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm/configs/multi_v7_defconfig ++++ b/arch/arm/configs/multi_v7_defconfig +@@ -235,6 +235,7 @@ CONFIG_SND_SOC_TEGRA_MAX98090=y + CONFIG_USB=y + CONFIG_USB_XHCI_HCD=y + CONFIG_USB_EHCI_HCD=y ++CONFIG_USB_EHCI_EXYNOS=y + CONFIG_USB_EHCI_TEGRA=y + CONFIG_USB_EHCI_HCD_PLATFORM=y + CONFIG_USB_ISP1760_HCD=y diff --git a/queue-3.14/series b/queue-3.14/series index aaed5673078..3a5e4d980da 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -38,3 +38,5 @@ misc-genwqe-check-for-error-from-get_user_pages_fast.patch alsa-usb-audio-extend-kef-x300a-fu-10-tweak-to-arcam-rpac.patch alsa-hda-using-uninitialized-data.patch alsa-hda-fix-wrong-gpio_dir-gpio_mask-hint-setups-for-idt-stac-codecs.patch +usb-cdc-acm-check-for-valid-interfaces.patch +add-usb_ehci_exynos-to-multi_v7_defconfig.patch diff --git a/queue-3.14/usb-cdc-acm-check-for-valid-interfaces.patch b/queue-3.14/usb-cdc-acm-check-for-valid-interfaces.patch new file mode 100644 index 00000000000..e81aa65d7dc --- /dev/null +++ b/queue-3.14/usb-cdc-acm-check-for-valid-interfaces.patch @@ -0,0 +1,38 @@ +From 403dff4e2c94f275e24fd85f40b2732ffec268a1 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Fri, 7 Nov 2014 08:48:15 -0800 +Subject: USB: cdc-acm: check for valid interfaces + +From: Greg Kroah-Hartman + +commit 403dff4e2c94f275e24fd85f40b2732ffec268a1 upstream. + +We need to check that we have both a valid data and control inteface for both +types of headers (union and not union.) + +References: https://bugzilla.kernel.org/show_bug.cgi?id=83551 +Reported-by: Simon Schubert <2+kernel@0x2c.org> +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/class/cdc-acm.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +--- a/drivers/usb/class/cdc-acm.c ++++ b/drivers/usb/class/cdc-acm.c +@@ -1169,10 +1169,11 @@ next_desc: + } else { + control_interface = usb_ifnum_to_if(usb_dev, union_header->bMasterInterface0); + data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = union_header->bSlaveInterface0)); +- if (!control_interface || !data_interface) { +- dev_dbg(&intf->dev, "no interfaces\n"); +- return -ENODEV; +- } ++ } ++ ++ if (!control_interface || !data_interface) { ++ dev_dbg(&intf->dev, "no interfaces\n"); ++ return -ENODEV; + } + + if (data_interface_num != call_interface_num)