← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/usb/serial/oti6858.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/oti6858.c
188
188
        u8 setup_done;
189
189
        struct delayed_work delayed_setup_work;
190
190
 
191
 
        wait_queue_head_t intr_wait;
192
191
        struct usb_serial_port *port;   /* USB port with which associated */
193
192
};
194
193
 
339
338
                return -ENOMEM;
340
339
 
341
340
        spin_lock_init(&priv->lock);
342
 
        init_waitqueue_head(&priv->intr_wait);
343
341
        priv->port = port;
344
342
        INIT_DELAYED_WORK(&priv->delayed_setup_work, setup_line);
345
343
        INIT_DELAYED_WORK(&priv->delayed_write_work, send_data);
664
662
        spin_unlock_irqrestore(&priv->lock, flags);
665
663
 
666
664
        while (1) {
667
 
                wait_event_interruptible(priv->intr_wait,
 
665
                wait_event_interruptible(port->delta_msr_wait,
 
666
                                        port->serial->disconnected ||
668
667
                                        priv->status.pin_state != prev);
669
668
                if (signal_pending(current))
670
669
                        return -ERESTARTSYS;
671
670
 
 
671
                if (port->serial->disconnected)
 
672
                        return -EIO;
 
673
 
672
674
                spin_lock_irqsave(&priv->lock, flags);
673
675
                status = priv->status.pin_state & PIN_MASK;
674
676
                spin_unlock_irqrestore(&priv->lock, flags);
763
765
 
764
766
                if (!priv->transient) {
765
767
                        if (xs->pin_state != priv->status.pin_state)
766
 
                                wake_up_interruptible(&priv->intr_wait);
 
768
                                wake_up_interruptible(&port->delta_msr_wait);
767
769
                        memcpy(&priv->status, xs, OTI6858_CTRL_PKT_SIZE);
768
770
                }
769
771