~ubuntu-branches/ubuntu/saucy/linux-ppc/saucy

« back to all changes in this revision

Viewing changes to drivers/usb/serial/io_ti.c

  • Committer: Package Import Robot
  • Author(s): Ben Collins, Ubuntu: 3.8.0-17.27
  • Date: 2013-04-08 18:16:48 UTC
  • mfrom: (16.1.9 raring)
  • Revision ID: package-import@ubuntu.com-20130408181648-z7suubhgtq6k6zke
Tags: 3.8.0-8.14
[ Ubuntu: 3.8.0-17.27 ]

* SAUCE: (no-up) Bluetooth: Add support for 04ca:2007
  - LP: #1153448
* SAUCE: (no-up) Bluetooth: Add support for 105b:e065
  - LP: #1161261
* SAUCE: (no-up) tools/power turbostat: additional Haswell CPU-id
  - LP: #1083993
* Revert "SAUCE: (no-up) seccomp: forcing auditing of kill condition"
  Replaced by upstream patch.
* Release Tracking Bug
  - LP: #1165746
* rebase to v3.8.6
* Revert "brcmsmac: support 4313iPA"
  - LP: #1157190
* tools/power turbostat: support Haswell
  - LP: #1083993
* net: calxedaxgmac: fix rx ring handling when OOM
* cpufreq: check OF node /cpus presence before dereferencing it
* Input: cypress_ps2 - fix trackpadi found in Dell XPS12
  - LP: #1103594
* ARM: OMAP2+: Limit omap initcalls to omap only on multiplatform kernels
* ARM: OMAP2+: Use omap initcalls
* ARM: OMAP: Fix i2c cmdline initcall for multiplatform
* ARM: OMAP: Fix dmaengine init for multiplatform
* ARM: OMAP2+: Add multiplatform debug_ll support
* ARM: OMAP2+: Disable code that currently does not work with
  multiplaform
* ARM: OMAP2+: Enable ARCH_MULTIPLATFORM support
* ARM: OMAP2+: Add minimal support for booting vexpress
* ARM: OMAP2+: Remove now obsolete uncompress.h and debug-macro.S
* davinci: do not include mach/hardware.h
* clk: export __clk_get_name for re-use in imx-ipu-v3 and others
* [SCSI] storvsc: avoid usage of WRITE_SAME
  - LP: #1157952
* ACPICA: Fix possible memory leak in dispatcher error path.
* KVM: x86: fix for buffer overflow in handling of MSR_KVM_SYSTEM_TIME (CVE-2013-1796)
  - LP: #1158254
  - CVE-2013-1796
* SAUCE: (no-up) Bluetooth: Add a load_firmware callback to struct hci_dev
  - LP: #1065400
* SAUCE: (no-up) Bluetooth: Implement broadcom patchram firmware loader
  - LP: #1065400
* SAUCE: (no-up) Bluetooth: Add support for 13d3:3388 and 13d3:3389
  - LP: #1065400

Show diffs side-by-side

added added

removed removed

Lines of Context:
87
87
        int close_pending;
88
88
        int lsr_event;
89
89
        struct async_icount     icount;
90
 
        wait_queue_head_t       delta_msr_wait; /* for handling sleeping while
91
 
                                                   waiting for msr change to
92
 
                                                   happen */
93
90
        struct edgeport_serial  *edge_serial;
94
91
        struct usb_serial_port  *port;
95
92
        __u8 bUartMode;         /* Port type, 0: RS232, etc. */
1518
1515
                        icount->dcd++;
1519
1516
                if (msr & EDGEPORT_MSR_DELTA_RI)
1520
1517
                        icount->rng++;
1521
 
                wake_up_interruptible(&edge_port->delta_msr_wait);
 
1518
                wake_up_interruptible(&edge_port->port->delta_msr_wait);
1522
1519
        }
1523
1520
 
1524
1521
        /* Save the new modem status */
1821
1818
        dev = port->serial->dev;
1822
1819
 
1823
1820
        memset(&(edge_port->icount), 0x00, sizeof(edge_port->icount));
1824
 
        init_waitqueue_head(&edge_port->delta_msr_wait);
1825
1821
 
1826
1822
        /* turn off loopback */
1827
1823
        status = ti_do_config(edge_port, UMPC_SET_CLR_LOOPBACK, 0);
2488
2484
                dev_dbg(&port->dev, "%s - TIOCMIWAIT\n", __func__);
2489
2485
                cprev = edge_port->icount;
2490
2486
                while (1) {
2491
 
                        interruptible_sleep_on(&edge_port->delta_msr_wait);
 
2487
                        interruptible_sleep_on(&port->delta_msr_wait);
2492
2488
                        /* see if a signal did it */
2493
2489
                        if (signal_pending(current))
2494
2490
                                return -ERESTARTSYS;
 
2491
 
 
2492
                        if (port->serial->disconnected)
 
2493
                                return -EIO;
 
2494
 
2495
2495
                        cnow = edge_port->icount;
2496
2496
                        if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr &&
2497
2497
                            cnow.dcd == cprev.dcd && cnow.cts == cprev.cts)