]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 21 Nov 2012 20:24:38 +0000 (12:24 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 21 Nov 2012 20:24:38 +0000 (12:24 -0800)
added patches:
acpi-video-ignore-errors-after-_dod-evaluation.patch
revert-serial-omap-fix-software-flow-control.patch

queue-3.4/acpi-video-ignore-errors-after-_dod-evaluation.patch [new file with mode: 0644]
queue-3.4/revert-serial-omap-fix-software-flow-control.patch [new file with mode: 0644]
queue-3.4/series

diff --git a/queue-3.4/acpi-video-ignore-errors-after-_dod-evaluation.patch b/queue-3.4/acpi-video-ignore-errors-after-_dod-evaluation.patch
new file mode 100644 (file)
index 0000000..dd76d4d
--- /dev/null
@@ -0,0 +1,46 @@
+From fba4e087361605d1eed63343bb08811f097c83ee Mon Sep 17 00:00:00 2001
+From: Igor Murzov <e-mail@date.by>
+Date: Sat, 13 Oct 2012 04:41:25 +0400
+Subject: ACPI video: Ignore errors after _DOD evaluation.
+
+From: Igor Murzov <e-mail@date.by>
+
+commit fba4e087361605d1eed63343bb08811f097c83ee upstream.
+
+There are systems where video module known to work fine regardless
+of broken _DOD and ignoring returned value here doesn't cause
+any issues later. This should fix brightness controls on some laptops.
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=47861
+
+Signed-off-by: Igor Murzov <e-mail@date.by>
+Reviewed-by: Sergey V <sftp.mtuci@gmail.com>
+Signed-off-by: Zhang Rui <rui.zhang@intel.com>
+Signed-off-by: Abdallah Chatila <abdallah.chatila@ericsson.com>
+
+---
+ drivers/acpi/video.c |   11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+--- a/drivers/acpi/video.c
++++ b/drivers/acpi/video.c
+@@ -1345,12 +1345,15 @@ static int
+ acpi_video_bus_get_devices(struct acpi_video_bus *video,
+                          struct acpi_device *device)
+ {
+-      int status;
++      int status = 0;
+       struct acpi_device *dev;
+-      status = acpi_video_device_enumerate(video);
+-      if (status)
+-              return status;
++      /*
++       * There are systems where video module known to work fine regardless
++       * of broken _DOD and ignoring returned value here doesn't cause
++       * any issues later.
++       */
++      acpi_video_device_enumerate(video);
+       list_for_each_entry(dev, &device->children, node) {
diff --git a/queue-3.4/revert-serial-omap-fix-software-flow-control.patch b/queue-3.4/revert-serial-omap-fix-software-flow-control.patch
new file mode 100644 (file)
index 0000000..c975663
--- /dev/null
@@ -0,0 +1,73 @@
+From a4f743851f74fc3e0cc40c13082e65c24139f481 Mon Sep 17 00:00:00 2001
+From: Felipe Balbi <balbi@ti.com>
+Date: Tue, 16 Oct 2012 17:09:22 +0300
+Subject: Revert "serial: omap: fix software flow control"
+
+From: Felipe Balbi <balbi@ti.com>
+
+commit a4f743851f74fc3e0cc40c13082e65c24139f481 upstream.
+
+This reverts commit 957ee7270d632245b43f6feb0e70d9a5e9ea6cf6
+(serial: omap: fix software flow control).
+
+As Russell has pointed out, that commit isn't fixing
+Software Flow Control at all, and it actually makes
+it even more broken.
+
+It was agreed to revert this commit and use Russell's
+latest UART patches instead.
+
+Signed-off-by: Felipe Balbi <balbi@ti.com>
+Cc: Russell King <linux@arm.linux.org.uk>
+Acked-by: Tony Lindgren <tony@atomide.com>
+Cc: Andreas Bießmann <andreas.devel@googlemail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/plat-omap/include/plat/omap-serial.h |    4 ++--
+ drivers/tty/serial/omap-serial.c              |   12 ++++++------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+--- a/arch/arm/plat-omap/include/plat/omap-serial.h
++++ b/arch/arm/plat-omap/include/plat/omap-serial.h
+@@ -42,10 +42,10 @@
+ #define OMAP_UART_WER_MOD_WKUP        0X7F
+ /* Enable XON/XOFF flow control on output */
+-#define OMAP_UART_SW_TX               0x8
++#define OMAP_UART_SW_TX               0x04
+ /* Enable XON/XOFF flow control on input */
+-#define OMAP_UART_SW_RX               0x2
++#define OMAP_UART_SW_RX               0x04
+ #define OMAP_UART_SYSC_RESET  0X07
+ #define OMAP_UART_TCR_TRIG    0X0F
+--- a/drivers/tty/serial/omap-serial.c
++++ b/drivers/tty/serial/omap-serial.c
+@@ -649,19 +649,19 @@ serial_omap_configure_xonxoff
+       /*
+        * IXON Flag:
+-       * Flow control for OMAP.TX
+-       * OMAP.RX should listen for XON/XOFF
++       * Enable XON/XOFF flow control on output.
++       * Transmit XON1, XOFF1
+        */
+       if (termios->c_iflag & IXON)
+-              up->efr |= OMAP_UART_SW_RX;
++              up->efr |= OMAP_UART_SW_TX;
+       /*
+        * IXOFF Flag:
+-       * Flow control for OMAP.RX
+-       * OMAP.TX should send XON/XOFF
++       * Enable XON/XOFF flow control on input.
++       * Receiver compares XON1, XOFF1.
+        */
+       if (termios->c_iflag & IXOFF)
+-              up->efr |= OMAP_UART_SW_TX;
++              up->efr |= OMAP_UART_SW_RX;
+       serial_out(up, UART_EFR, up->efr | UART_EFR_ECB);
+       serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
index b4dd0cc883ba79b5221f104270c5f8357d800631..77a639d8375e00ba18f6285f2daaf4de8e0ad396 100644 (file)
@@ -167,3 +167,5 @@ selinux-fix-sel_netnode_insert-suspicious-rcu-dereference.patch
 0112-ceph-Fix-oops-when-handling-mdsmap-that-decreases-ma.patch
 0113-libceph-check-for-invalid-mapping.patch
 0114-ceph-avoid-32-bit-page-index-overflow.patch
+acpi-video-ignore-errors-after-_dod-evaluation.patch
+revert-serial-omap-fix-software-flow-control.patch