Merge tag 'omapdss-for-3.5' of git://github.com/tomba/linux into fbdev-next

Omapdss driver changes for 3.5 merge window.

Lots of normal development commits, but perhaps most notable changes are:

* HDMI rework to properly decouple the HDMI audio part from the HDMI video part.
* Restructure omapdss core driver so that it's possible to implement device
  tree support. This included changing how platform data is passed to the
  drivers, changing display device registration and improving the panel driver's
  ability to configure the underlying video output interface.
* Basic support for DSI packet interleaving

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/tty/serial/8250/8250.c b/drivers/tty/serial/8250/8250.c
index 5b149b466ec8..5c27f7e6c9f1 100644
--- a/drivers/tty/serial/8250/8250.c
+++ b/drivers/tty/serial/8250/8250.c
@@ -1572,13 +1572,11 @@ static irqreturn_t serial8250_interrupt(int irq, void *dev_id)
         do {
                 struct uart_8250_port *up;
                 struct uart_port *port;
-                bool skip;
 
                 up = list_entry(l, struct uart_8250_port, list);
                 port = &up->port;
-                skip = pass_counter && up->port.flags & UPF_IIR_ONCE;
 
-                if (!skip && port->handle_irq(port)) {
+                if (port->handle_irq(port)) {
                         handled = 1;
                         end = NULL;
                 } else if (end == NULL)
@@ -2037,10 +2035,12 @@ static int serial8250_startup(struct uart_port *port)
                 spin_unlock_irqrestore(&port->lock, flags);
 
                 /*
-                 * If the interrupt is not reasserted, setup a timer to
-                 * kick the UART on a regular basis.
+                 * If the interrupt is not reasserted, or we otherwise
+                 * don't trust the iir, setup a timer to kick the UART
+                 * on a regular basis.
                  */
-                if (!(iir1 & UART_IIR_NO_INT) && (iir & UART_IIR_NO_INT)) {
+                if ((!(iir1 & UART_IIR_NO_INT) && (iir & UART_IIR_NO_INT)) ||
+                    up->port.flags & UPF_BUG_THRE) {
                         up->bugs |= UART_BUG_THRE;
                         pr_debug("ttyS%d - using backup timer\n",
                                  serial_index(port));