← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-ppc/trusty

« back to all changes in this revision

Viewing changes to drivers/usb/serial/mct_u232.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/mct_u232.c
114
114
        unsigned char        last_msr;      /* Modem Status Register */
115
115
        unsigned int         rx_flags;      /* Throttling flags */
116
116
        struct async_icount  icount;
117
 
        wait_queue_head_t    msr_wait;  /* for handling sleeping while waiting
118
 
                                                for msr change to happen */
119
117
};
120
118
 
121
119
#define THROTTLED               0x01
409
407
                return -ENOMEM;
410
408
 
411
409
        spin_lock_init(&priv->lock);
412
 
        init_waitqueue_head(&priv->msr_wait);
413
410
 
414
411
        usb_set_serial_port_data(port, priv);
415
412
 
606
603
                tty_kref_put(tty);
607
604
        }
608
605
#endif
609
 
        wake_up_interruptible(&priv->msr_wait);
 
606
        wake_up_interruptible(&port->delta_msr_wait);
610
607
        spin_unlock_irqrestore(&priv->lock, flags);
611
608
exit:
612
609
        retval = usb_submit_urb(urb, GFP_ATOMIC);
815
812
                cprev = mct_u232_port->icount;
816
813
                spin_unlock_irqrestore(&mct_u232_port->lock, flags);
817
814
                for ( ; ; ) {
818
 
                        prepare_to_wait(&mct_u232_port->msr_wait,
 
815
                        prepare_to_wait(&port->delta_msr_wait,
819
816
                                        &wait, TASK_INTERRUPTIBLE);
820
817
                        schedule();
821
 
                        finish_wait(&mct_u232_port->msr_wait, &wait);
 
818
                        finish_wait(&port->delta_msr_wait, &wait);
822
819
                        /* see if a signal did it */
823
820
                        if (signal_pending(current))
824
821
                                return -ERESTARTSYS;
 
822
 
 
823
                        if (port->serial->disconnected)
 
824
                                return -EIO;
 
825
 
825
826
                        spin_lock_irqsave(&mct_u232_port->lock, flags);
826
827
                        cnow = mct_u232_port->icount;
827
828
                        spin_unlock_irqrestore(&mct_u232_port->lock, flags);