← 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/serial/ftdi_sio.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/serial/ftdi_sio.c
197
197
        { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_THROTTLE_PID) },
198
198
        { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_GATEWAY_PID) },
199
199
        { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_GBM_PID) },
 
200
        { USB_DEVICE(NEWPORT_VID, NEWPORT_AGILIS_PID) },
200
201
        { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_IOBOARD_PID) },
201
202
        { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_MINI_IOBOARD_PID) },
202
203
        { USB_DEVICE(FTDI_VID, FTDI_SPROG_II) },
880
881
        { USB_DEVICE(FTDI_VID, FTDI_DISTORTEC_JTAG_LOCK_PICK_PID),
881
882
                .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
882
883
        { USB_DEVICE(FTDI_VID, FTDI_LUMEL_PD12_PID) },
 
884
        /* Crucible Devices */
 
885
        { USB_DEVICE(FTDI_VID, FTDI_CT_COMET_PID) },
883
886
        { },                                    /* Optional parameter entry */
884
887
        { }                                     /* Terminating entry */
885
888
};
1787
1790
        struct usb_device *udev = serial->dev;
1788
1791
 
1789
1792
        if ((udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) ||
1790
 
            (udev->product && !strcmp(udev->product, "BeagleBone/XDS100")))
 
1793
            (udev->product && !strcmp(udev->product, "BeagleBone/XDS100V2")))
1791
1794
                return ftdi_jtag_probe(serial);
1792
1795
 
1793
1796
        return 0;