← Back to branch summary

~ubuntu-branches/ubuntu/raring/linux-ti-omap4/raring-proposed

« back to all changes in this revision

Viewing changes to drivers/usb/host/xhci-pci.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-25.38
  • Date: 2013-02-20 22:03:31 UTC
  • mfrom: (74.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20130220220331-0ea4l33x3cr61nch
Tags: 3.5.0-220.28
https://launchpad.net/bugs/1130311
https://launchpad.net/bugs/1129472
https://launchpad.net/bugs/1119885
https://launchpad.net/bugs/1129192
https://launchpad.net/bugs/1119885
https://launchpad.net/bugs/1129192
https://launchpad.net/bugs/1119885
https://launchpad.net/bugs/1129192
* Release Tracking Bug
  - LP: #1130311

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-25.38

[ Ubuntu: 3.5.0-25.38 ]

* Release Tracking Bug
  - LP: #1129472
* ptrace: introduce signal_wake_up_state() and ptrace_signal_wake_up()
  - LP: #1119885, #1129192
  - CVE-2013-0871
* ptrace: ensure arch_ptrace/ptrace_request can never race with SIGKILL
  - LP: #1119885, #1129192
  - CVE-2013-0871
* wake_up_process() should be never used to wakeup a TASK_STOPPED/TRACED
  task
  - LP: #1119885, #1129192
  - CVE-2013-0871

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/usb/host/xhci-pci.c
29
29
/* Device for a quirk */
30
30
#define PCI_VENDOR_ID_FRESCO_LOGIC      0x1b73
31
31
#define PCI_DEVICE_ID_FRESCO_LOGIC_PDK  0x1000
 
32
#define PCI_DEVICE_ID_FRESCO_LOGIC_FL1400       0x1400
32
33
 
33
34
#define PCI_VENDOR_ID_ETRON             0x1b6f
34
35
#define PCI_DEVICE_ID_ASROCK_P67        0x7023
58
59
 
59
60
        /* Look for vendor-specific quirks */
60
61
        if (pdev->vendor == PCI_VENDOR_ID_FRESCO_LOGIC &&
61
 
                        pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK) {
62
 
                if (pdev->revision == 0x0) {
 
62
                        (pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK ||
 
63
                         pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_FL1400)) {
 
64
                if (pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK &&
 
65
                                pdev->revision == 0x0) {
63
66
                        xhci->quirks |= XHCI_RESET_EP_QUIRK;
64
67
                        xhci_dbg(xhci, "QUIRK: Fresco Logic xHC needs configure"
65
68
                                        " endpoint cmd after reset endpoint\n");