From: Greg Kroah-Hartman Date: Tue, 10 Dec 2013 07:58:47 +0000 (-0800) Subject: 3.4-stable patches X-Git-Tag: v3.4.74~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b14356371712af0533811bb9ff8b093d4bf5852;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: drivers-char-i8k.c-add-dell-xpls-l421x.patch usb-cdc-acm-added-support-for-the-lenovo-rd02-d400-usb-modem.patch usb-mos7840-correct-handling-of-cs5-setting.patch usb-spcp8x5-correct-handling-of-cs5-setting.patch --- diff --git a/queue-3.4/drivers-char-i8k.c-add-dell-xpls-l421x.patch b/queue-3.4/drivers-char-i8k.c-add-dell-xpls-l421x.patch new file mode 100644 index 00000000000..0b4e88a399d --- /dev/null +++ b/queue-3.4/drivers-char-i8k.c-add-dell-xpls-l421x.patch @@ -0,0 +1,36 @@ +From 9aa5b0181bdf335f0b731d8502e128a862884bcd Mon Sep 17 00:00:00 2001 +From: Alan Cox +Date: Tue, 3 Dec 2013 13:56:56 -0800 +Subject: drivers/char/i8k.c: add Dell XPLS L421X + +From: Alan Cox + +commit 9aa5b0181bdf335f0b731d8502e128a862884bcd upstream. + +Addresses https://bugzilla.kernel.org/show_bug.cgi?id=60772 + +Signed-off-by: Alan Cox +Reported-by: Leho Kraav +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/char/i8k.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/char/i8k.c ++++ b/drivers/char/i8k.c +@@ -664,6 +664,13 @@ static struct dmi_system_id __initdata i + DMI_MATCH(DMI_PRODUCT_NAME, "Vostro"), + }, + }, ++ { ++ .ident = "Dell XPS421", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "XPS L421X"), ++ }, ++ }, + { } + }; + diff --git a/queue-3.4/series b/queue-3.4/series index f00ce136a93..89c8e7b0ddc 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -19,3 +19,7 @@ ahci-add-device-ids-for-intel-lynx-point-lp-pch.patch ahci-ahci-mode-sata-patch-for-intel-avoton-deviceids.patch i2c-i801-smbus-patch-for-intel-avoton-deviceids.patch usb-pl2303-fixed-handling-of-cs5-setting.patch +usb-mos7840-correct-handling-of-cs5-setting.patch +usb-spcp8x5-correct-handling-of-cs5-setting.patch +usb-cdc-acm-added-support-for-the-lenovo-rd02-d400-usb-modem.patch +drivers-char-i8k.c-add-dell-xpls-l421x.patch diff --git a/queue-3.4/usb-cdc-acm-added-support-for-the-lenovo-rd02-d400-usb-modem.patch b/queue-3.4/usb-cdc-acm-added-support-for-the-lenovo-rd02-d400-usb-modem.patch new file mode 100644 index 00000000000..64552ef9a3f --- /dev/null +++ b/queue-3.4/usb-cdc-acm-added-support-for-the-lenovo-rd02-d400-usb-modem.patch @@ -0,0 +1,27 @@ +From 3b59d16c513da258ec8f6a0b4db85f257a0380d6 Mon Sep 17 00:00:00 2001 +From: David Cluytens +Date: Tue, 3 Dec 2013 14:18:57 +0100 +Subject: USB: cdc-acm: Added support for the Lenovo RD02-D400 USB Modem + +From: David Cluytens + +commit 3b59d16c513da258ec8f6a0b4db85f257a0380d6 upstream. + +Signed-off-by: David Cluytens +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/class/cdc-acm.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/usb/class/cdc-acm.c ++++ b/drivers/usb/class/cdc-acm.c +@@ -1542,6 +1542,8 @@ static int acm_reset_resume(struct usb_i + + static const struct usb_device_id acm_ids[] = { + /* quirky and broken devices */ ++ { USB_DEVICE(0x17ef, 0x7000), /* Lenovo USB modem */ ++ .driver_info = NO_UNION_NORMAL, },/* has no union descriptor */ + { USB_DEVICE(0x0870, 0x0001), /* Metricom GS Modem */ + .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ + }, diff --git a/queue-3.4/usb-mos7840-correct-handling-of-cs5-setting.patch b/queue-3.4/usb-mos7840-correct-handling-of-cs5-setting.patch new file mode 100644 index 00000000000..1a4333a1c3c --- /dev/null +++ b/queue-3.4/usb-mos7840-correct-handling-of-cs5-setting.patch @@ -0,0 +1,66 @@ +From 78692cc3382e0603a47e1f2aaeffe0d99891994d Mon Sep 17 00:00:00 2001 +From: Colin Leitner +Date: Fri, 8 Nov 2013 22:52:34 +0100 +Subject: USB: mos7840: correct handling of CS5 setting + +From: Colin Leitner + +commit 78692cc3382e0603a47e1f2aaeffe0d99891994d upstream. + +This patch removes an erroneous check of CSIZE, which made it impossible to set +CS5. + +Compiles clean, but couldn't test against hardware. + +Signed-off-by: Colin Leitner +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/mos7840.c | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +--- a/drivers/usb/serial/mos7840.c ++++ b/drivers/usb/serial/mos7840.c +@@ -1962,25 +1962,25 @@ static void mos7840_change_port_settings + iflag = tty->termios->c_iflag; + + /* Change the number of bits */ +- if (cflag & CSIZE) { +- switch (cflag & CSIZE) { +- case CS5: +- lData = LCR_BITS_5; +- break; ++ switch (cflag & CSIZE) { ++ case CS5: ++ lData = LCR_BITS_5; ++ break; + +- case CS6: +- lData = LCR_BITS_6; +- break; ++ case CS6: ++ lData = LCR_BITS_6; ++ break; + +- case CS7: +- lData = LCR_BITS_7; +- break; +- default: +- case CS8: +- lData = LCR_BITS_8; +- break; +- } ++ case CS7: ++ lData = LCR_BITS_7; ++ break; ++ ++ default: ++ case CS8: ++ lData = LCR_BITS_8; ++ break; + } ++ + /* Change the Parity bit */ + if (cflag & PARENB) { + if (cflag & PARODD) { diff --git a/queue-3.4/usb-spcp8x5-correct-handling-of-cs5-setting.patch b/queue-3.4/usb-spcp8x5-correct-handling-of-cs5-setting.patch new file mode 100644 index 00000000000..4fe40d1afaa --- /dev/null +++ b/queue-3.4/usb-spcp8x5-correct-handling-of-cs5-setting.patch @@ -0,0 +1,61 @@ +From 711fbdfbf2bc4827214a650afe3f64767a1aba16 Mon Sep 17 00:00:00 2001 +From: Colin Leitner +Date: Fri, 8 Nov 2013 22:53:11 +0100 +Subject: USB: spcp8x5: correct handling of CS5 setting + +From: Colin Leitner + +commit 711fbdfbf2bc4827214a650afe3f64767a1aba16 upstream. + +This patch removes an erroneous check of CSIZE, which made it impossible to set +CS5. + +Compiles clean, but couldn't test against hardware. + +Signed-off-by: Colin Leitner +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/spcp8x5.c | 30 ++++++++++++++---------------- + 1 file changed, 14 insertions(+), 16 deletions(-) + +--- a/drivers/usb/serial/spcp8x5.c ++++ b/drivers/usb/serial/spcp8x5.c +@@ -396,22 +396,20 @@ static void spcp8x5_set_termios(struct t + } + + /* Set Data Length : 00:5bit, 01:6bit, 10:7bit, 11:8bit */ +- if (cflag & CSIZE) { +- switch (cflag & CSIZE) { +- case CS5: +- buf[1] |= SET_UART_FORMAT_SIZE_5; +- break; +- case CS6: +- buf[1] |= SET_UART_FORMAT_SIZE_6; +- break; +- case CS7: +- buf[1] |= SET_UART_FORMAT_SIZE_7; +- break; +- default: +- case CS8: +- buf[1] |= SET_UART_FORMAT_SIZE_8; +- break; +- } ++ switch (cflag & CSIZE) { ++ case CS5: ++ buf[1] |= SET_UART_FORMAT_SIZE_5; ++ break; ++ case CS6: ++ buf[1] |= SET_UART_FORMAT_SIZE_6; ++ break; ++ case CS7: ++ buf[1] |= SET_UART_FORMAT_SIZE_7; ++ break; ++ default: ++ case CS8: ++ buf[1] |= SET_UART_FORMAT_SIZE_8; ++ break; + } + + /* Set Stop bit2 : 0:1bit 1:2bit */