← Back to branch summary

~ubuntu-branches/ubuntu/wily/linux-ti-omap4/wily

« back to all changes in this revision

Viewing changes to drivers/tty/serial/8250/8250.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-26.42
  • Date: 2013-03-14 15:21:40 UTC
  • mfrom: (76.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20130314152140-tl4mkjmxa038tm3h
Tags: 3.5.0-221.31
https://launchpad.net/bugs/1153648
https://launchpad.net/bugs/1152715
https://launchpad.net/bugs/1122094
https://launchpad.net/bugs/1147678
* Release Tracking Bug
  - LP: #1153648

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-26.42

[ Ubuntu: 3.5.0-26.42 ]

* Release Tracking Bug
  - LP: #1152715
* ubuntu: overlayfs -- fix missmerge of vfs_open changes
  - LP: #1122094, #1147678

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/tty/serial/8250/8250.c
282
282
                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
283
283
                .flags          = UART_CAP_FIFO | UART_CAP_AFE | UART_CAP_EFR,
284
284
        },
 
285
        [PORT_BRCM_TRUMANAGE] = {
 
286
                .name           = "TruManage",
 
287
                .fifo_size      = 1,
 
288
                .tx_loadsz      = 1024,
 
289
                .flags          = UART_CAP_HFIFO,
 
290
        },
285
291
};
286
292
 
287
293
/* Uart divisor latch read */
1427
1433
                port->icount.tx++;
1428
1434
                if (uart_circ_empty(xmit))
1429
1435
                        break;
 
1436
                if (up->capabilities & UART_CAP_HFIFO) {
 
1437
                        if ((serial_port_in(port, UART_LSR) & BOTH_EMPTY) !=
 
1438
                            BOTH_EMPTY)
 
1439
                                break;
 
1440
                }
1430
1441
        } while (--count > 0);
1431
1442
 
1432
1443
        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)