← Back to branch summary

~ubuntu-branches/ubuntu/natty/linux-ti-omap4/natty-201011051436

« back to all changes in this revision

Viewing changes to drivers/serial/omap-serial.c

  • Committer: Bazaar Package Importer
  • Author(s): Tim Gardner, Sebastien Jan, Tim Gardner, Upstream Kernel Changes
  • Date: 2010-06-28 14:35:42 UTC
  • Revision ID: james.westby@ubuntu.com-20100628143542-pa6r3syv0z0mjvt1
Tags: 2.6.34-901.2
[ Sebastien Jan ]

* [Config] Fix configuration settings

[ Tim Gardner ]

* [Config] Fix Vcs-git entry

[ Upstream Kernel Changes ]

* Revert "ASoC: ABE: Fixes for hal 6.22"
* timer: fix for timer crash
* Serial: Hold an port lock while updating console.
* Serial: Use IIR reg to identify rx line irq.
* ASoC: ABE-TWL6040: Correct ABE initialization
* ASoC: OMAP: Correct ABE initialization
* ASoC: ABE: Support for pause resume
* ASoC: OMAP: Stop the codec after all stream are closed
* ASoC: ABE-TWL6040: Add digital_mute callback
* ASoC: Remove codec active flag
* Fix import of merge from audio branch
* ASoC: ABE: Correct implementation of hp filter
* ASoC: ABE-TWL6040: Mute the correct path
* smsc95xx: Add module parameter to override MAC address

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/serial/omap-serial.c
353
353
 
354
354
        spin_lock_irqsave(&up->port.lock, flags);
355
355
        lsr = serial_in(up, UART_LSR);
356
 
        if (iir & UART_IER_RLSI) {
 
356
        if (iir & UART_IIR_RLSI) {
357
357
                if (!up->use_dma) {
358
358
                        if (lsr & UART_LSR_DR)
359
359
                                receive_chars(up, &lsr);
917
917
        struct uart_omap_port *up = serial_omap_console_ports[co->index];
918
918
        unsigned int ier;
919
919
 
 
920
        spin_lock(&up->port.lock);
920
921
        /*
921
922
         * First save the IER then disable the interrupts
922
923
         */
940
941
         */
941
942
        if (up->msr_saved_flags)
942
943
                check_modem_status(up);
 
944
 
 
945
        spin_unlock(&up->port.lock);
943
946
}
944
947
 
945
948
static int __init