← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/usb/serial/ti_usb_3410_5052.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
https://launchpad.net/bugs/1153448
https://launchpad.net/bugs/1161261
https://launchpad.net/bugs/1083993
https://launchpad.net/bugs/1165746
https://launchpad.net/bugs/1157190
https://launchpad.net/bugs/1083993
https://launchpad.net/bugs/1103594
https://launchpad.net/bugs/1157952
https://launchpad.net/bugs/1158254
https://launchpad.net/bugs/1065400
https://launchpad.net/bugs/1065400
https://launchpad.net/bugs/1065400
[ 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:
drivers/usb/serial/ti_usb_3410_5052.c
74
74
        int                     tp_flags;
75
75
        int                     tp_closing_wait;/* in .01 secs */
76
76
        struct async_icount     tp_icount;
77
 
        wait_queue_head_t       tp_msr_wait;    /* wait for msr change */
78
77
        wait_queue_head_t       tp_write_wait;
79
78
        struct ti_device        *tp_tdev;
80
79
        struct usb_serial_port  *tp_port;
432
431
        else
433
432
                tport->tp_uart_base_addr = TI_UART2_BASE_ADDR;
434
433
        tport->tp_closing_wait = closing_wait;
435
 
        init_waitqueue_head(&tport->tp_msr_wait);
436
434
        init_waitqueue_head(&tport->tp_write_wait);
437
435
        if (kfifo_alloc(&tport->write_fifo, TI_WRITE_BUF_SIZE, GFP_KERNEL)) {
438
436
                kfree(tport);
784
782
                dev_dbg(&port->dev, "%s - TIOCMIWAIT\n", __func__);
785
783
                cprev = tport->tp_icount;
786
784
                while (1) {
787
 
                        interruptible_sleep_on(&tport->tp_msr_wait);
 
785
                        interruptible_sleep_on(&port->delta_msr_wait);
788
786
                        if (signal_pending(current))
789
787
                                return -ERESTARTSYS;
 
788
 
 
789
                        if (port->serial->disconnected)
 
790
                                return -EIO;
 
791
 
790
792
                        cnow = tport->tp_icount;
791
793
                        if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr &&
792
794
                            cnow.dcd == cprev.dcd && cnow.cts == cprev.cts)
1400
1402
                        icount->dcd++;
1401
1403
                if (msr & TI_MSR_DELTA_RI)
1402
1404
                        icount->rng++;
1403
 
                wake_up_interruptible(&tport->tp_msr_wait);
 
1405
                wake_up_interruptible(&tport->tp_port->delta_msr_wait);
1404
1406
                spin_unlock_irqrestore(&tport->tp_lock, flags);
1405
1407
        }
1406
1408